diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 23 | ||||
-rwxr-xr-x | src/configure | 16 |
2 files changed, 22 insertions, 17 deletions
diff --git a/src/Makefile b/src/Makefile index 7ee758e..5a4cebf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -90,7 +90,6 @@ clean: rm -f cfg_scan.c rm -f cfg_parse.c cfg_parse.h rm -f $(EXECUTABLE) - rm -f $(EXECUTABLE).exe cleanall: clean $(MAKE) --directory="../doc/" clean @@ -99,8 +98,8 @@ manpage: $(MAKE) --directory="../doc/" manpage -INSTALL_TARGETS := install-bin #install-etc -REMOVE_TARGETS := remove-bin #remove-etc +INSTALL_TARGETS := install-bin install-etc +REMOVE_TARGETS := remove-bin remove-etc ifdef MANDIR INSTALL_TARGETS += install-man @@ -115,15 +114,20 @@ endif install: all $(INSTALL_TARGETS) install-bin: $(EXECUTABLE) - $(INSTALL) -d $(DESTDIR)$(SBINDIR) - $(INSTALL) -m 755 $(EXECUTABLE) $(DESTDIR)$(SBINDIR) + $(INSTALL) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 755 $(EXECUTABLE) $(DESTDIR)$(BINDIR) install-etc: - $(INSTALL) -d $(DESTDIR)$(ETCDIR)/$(EXECUTABLE) - @ echo "example configurations can be found at $(EXAMPLESDIR)/$(EXECUTABLE)" > $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)/README + $(INSTALL) -d $(DESTDIR)$(ETCDIR)/init.d/ + $(INSTALL) -m 755 ../contrib/initscript $(DESTDIR)$(ETCDIR)/init.d/$(EXECUTABLE) + $(INSTALL) -d $(DESTDIR)$(ETCDIR)/default/ + $(INSTALL) -m 644 ../contrib/default $(DESTDIR)$(ETCDIR)/default/$(EXECUTABLE) + @ echo "# $(EXECUTABLE) configuration file" > $(DESTDIR)$(ETCDIR)/$(EXECUTABLE).conf + @ echo "# example configurations can be found at $(EXAMPLESDIR)/$(EXECUTABLE)" >> $(DESTDIR)$(ETCDIR)/$(EXECUTABLE).conf install-examples: $(INSTALL) -d $(DESTDIR)$(EXAMPLESDIR)/$(EXECUTABLE) + $(INSTALL) -m 644 ../contrib/example.conf $(DESTDIR)$(EXAMPLESDIR)/$(EXECUTABLE)/ install-man: manpage $(INSTALL) -d $(DESTDIR)$(MANDIR)/man8/ @@ -134,7 +138,7 @@ uninstall: remove remove: $(REMOVE_TARGETS) remove-bin: - rm -f $(DESTDIR)$(SBINDIR)/$(EXECUTABLE) + rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE) remove-etc: rm -f $(DESTDIR)$(ETCDIR)/init.d/$(EXECUTABLE) @@ -146,4 +150,5 @@ remove-man: rm -f $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8 purge: remove - rm -rf $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)/ + rm -f $(DESTDIR)$(ETCDIR)/$(EXECUTABLE).conf + rm -f $(DESTDIR)$(ETCDIR)/default/$(EXECUTABLE) diff --git a/src/configure b/src/configure index 4afa358..b07190b 100755 --- a/src/configure +++ b/src/configure @@ -33,7 +33,7 @@ CFLAGS='-g -O2' LDFLAGS='-g -Wall -O2' PREFIX='/usr/local' -SBINDIR='' +BINDIR='' ETCDIR='' MANDIR='' INSTALLMANPAGE=1 @@ -44,7 +44,7 @@ print_usage() { echo "configure --help print this" echo " --target=<TARGET> build target i.e. Linux (default: autodetect)" echo " --prefix=<PREFIX> the installation prefix (default: /usr/local)" - echo " --sbindir=<DIR> the path to the sbin directory (default: $PREFIX/sbin)" + echo " --bindir=<DIR> the path to the bin directory (default: $PREFIX/bin)" 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 " --no-manpage dont't install manpage" @@ -61,8 +61,8 @@ do --prefix=*) PREFIX=${arg#--prefix=} ;; - --sbindir=*) - SBINDIR=${arg#--sbindir=} + --bindir=*) + BINDIR=${arg#--bindir=} ;; --sysconfdir=*) ETCDIR=${arg#--sysconfdir=} @@ -116,8 +116,8 @@ case $TARGET in ;; esac -if [ -z "$SBINDIR" ]; then - SBINDIR=$PREFIX/sbin +if [ -z "$BINDIR" ]; then + BINDIR=$PREFIX/bin fi if [ -z "$ETCDIR" ]; then @@ -147,7 +147,7 @@ FLEX := flex BISON := bison PREFIX := '$PREFIX' -SBINDIR := '$SBINDIR' +BINDIR := '$BINDIR' ETCDIR := '$ETCDIR' EOF @@ -193,7 +193,7 @@ cat >> config.h <<EOF #define TARGET "$TARGET" #define PREFIX "$PREFIX" -#define SBINDIR "$SBINDIR" +#define BINDIR "$BINDIR" #define ETCDIR "$ETCDIR" #define CONFFILE "$ETCDIR/tcpproxy.conf" |