diff options
| author | Christian Pointner <equinox@anytun.org> | 2009-11-11 02:36:53 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2009-11-11 02:36:53 +0000 |
| commit | 6ea80ce71f13d82b4ad8448558b146b2874d1f1a (patch) | |
| tree | 9a219428fa9de3dda1e939bd8169b37fea6e6c16 /src | |
| parent | updated ChangeLog (new svn location) (diff) | |
fixed install target
removed user installation for install target
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 14 | ||||
| -rwxr-xr-x | src/configure | 13 |
2 files changed, 3 insertions, 24 deletions
diff --git a/src/Makefile b/src/Makefile index bbcf6a6..e937827 100644 --- a/src/Makefile +++ b/src/Makefile @@ -97,7 +97,7 @@ clean: manpage: $(MAKE) --directory="../doc/" manpage -install: all install-bin install-etc install-man add-user +install: all install-bin install-etc install-man install-bin: $(EXECUTABLE) mkdir -p $(DESTDIR)$(SBINDIR) @@ -114,9 +114,6 @@ install-etc: cd $$dir ; \ mkdir -p $(DESTDIR)$(ETCDIR)/uanytun/$$dir ; \ install -m 600 config $(DESTDIR)$(ETCDIR)/uanytun/$$dir/config ; \ - sed -i 's#username uanytun#username $(USERNAME)#' $(DESTDIR)$(ETCDIR)/uanytun/$$dir/config ; \ - sed -i 's#groupname uanytun#groupname $(USERNAME)#' $(DESTDIR)$(ETCDIR)/uanytun/$$dir/config ; \ - sed -i 's#chroot /var/run/uanytun#chroot $(USERHOME)#' $(DESTDIR)$(ETCDIR)/uanytun/$$dir/config ; \ if [ -e 'post-up.sh' ]; then \ install -m 755 post-up.sh $(DESTDIR)$(ETCDIR)/uanytun/$$dir/post-up.sh ; \ fi ; \ @@ -134,17 +131,10 @@ install-man: manpage cp ../doc/uanytun.8 $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8 gzip $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8 -add-user: - @ adduser --system --group --home $(USERHOME) $(USERNAME) - -remove-user: - @ deluser $(USERNAME) - @ rm -rf $(USERHOME) - remove: rm -f $(DESTDIR)$(SBINDIR)/$(EXECUTABLE) rm -f $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8.gz rm -f $(DESTDIR)$(ETCDIR)/init.d/$(EXECUTABLE) -purge: remove remove-user +purge: remove rm -rf $(DESTDIR)$(ETCDIR)/uanytun/ diff --git a/src/configure b/src/configure index 5ba351a..51937f6 100755 --- a/src/configure +++ b/src/configure @@ -47,8 +47,6 @@ PREFIX='/usr/local' SBINDIR='' ETCDIR='' MANDIR='' -USERNAME='uanytun' -USERHOME='/var/run/uanytun' print_usage() { echo "configure --help print this" @@ -57,8 +55,6 @@ print_usage() { echo " --sbindir=<DIR> the path to the sbin directory (default: $PREFIX/sbin)" echo " --sysconfdir=<DIR> the path to the system configuration directory (default: $PREFIX/etc" echo " --mandir=<DIR> the path to the system man pages (default: $PREFIX/share/man)" - echo " --username=<USERNAME> create this user when installing (default: uanytun)" - echo " --userhome=<PATH> the home directory of the user to be created (default: /var/run/uanytun)" echo " --use-ssl-crypto use ssl crypto library instead of libgcrypt" echo " --no-crypto disable crypto at all (only NULL cipher)" echo " --disable-passphrase disable master key and salt passphrase" @@ -86,12 +82,6 @@ do --mandir=*) MANDIR=${arg#--mandir=} ;; - --username=*) - USERNAME=${arg#--username=} - ;; - --userhome=*) - USERHOME=${arg#--userhome=} - ;; --use-ssl-crypto) CRYPTO_LIB='ssl' ;; @@ -194,13 +184,12 @@ TARGET := $TARGET CC := gcc CFLAGS := $CFLAGS LDFLAGS := $LDFLAGS +STRIP := strip PREFIX := $PREFIX SBINDIR := $SBINDIR ETCDIR := $ETCDIR MANDIR := $MANDIR -USERNAME := $USERNAME -USERHOME := $USERHOME EOF exit 0 |