diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 15 | ||||
| -rwxr-xr-x | src/configure | 11 |
2 files changed, 3 insertions, 23 deletions
diff --git a/src/Makefile b/src/Makefile index 0e989ac..a2f101a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,7 +40,7 @@ C_OBJS := log.o \ C_SRCS := $(C_OBJS:%.o=%.c) -.PHONY: clean cleanall distclean manpage install install-bin install-etc install-man uninstall remove purge +.PHONY: clean cleanall distclean manpage install install-bin install-man uninstall remove all: $(EXECUTABLE) @@ -94,8 +94,8 @@ manpage: $(MAKE) --directory="../doc/" manpage -INSTALL_TARGETS := install-bin install-etc -REMOVE_TARGETS := remove-bin remove-etc +INSTALL_TARGETS := install-bin +REMOVE_TARGETS := remove-bin ifdef MANDIR INSTALL_TARGETS += install-man @@ -108,9 +108,6 @@ install-bin: $(EXECUTABLE) $(INSTALL) -d $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 $(EXECUTABLE) $(DESTDIR)$(BINDIR) -install-etc: - $(INSTALL) -d $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)/ - install-man: manpage $(INSTALL) -d $(DESTDIR)$(MANDIR)/man8/ $(INSTALL) -m 644 ../doc/$(EXECUTABLE).8 $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8 @@ -122,11 +119,5 @@ remove: $(REMOVE_TARGETS) remove-bin: rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE) -remove-etc: - rm -f $(DESTDIR)$(ETCDIR)/init.d/$(EXECUTABLE) - remove-man: rm -f $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8 - -purge: remove - rm -rf $(DESTDIR)$(ETCDIR)/$(EXECUTABLE) diff --git a/src/configure b/src/configure index 56a0112..9de0fca 100755 --- a/src/configure +++ b/src/configure @@ -33,7 +33,6 @@ LDFLAGS='-g -Wall -O2' PREFIX='/usr/local' BINDIR='' -ETCDIR='' MANDIR='' INSTALLMANPAGE=1 @@ -42,7 +41,6 @@ print_usage() { echo " --target=<TARGET> build target i.e. Linux (default: autodetect)" echo " --prefix=<PREFIX> the installation prefix (default: /usr/local)" 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" } @@ -59,9 +57,6 @@ do --bindir=*) BINDIR=${arg#--bindir=} ;; - --sysconfdir=*) - ETCDIR=${arg#--sysconfdir=} - ;; --mandir=*) MANDIR=${arg#--mandir=} ;; @@ -112,10 +107,6 @@ if [ -z "$BINDIR" ]; then BINDIR=$PREFIX/bin fi -if [ -z "$ETCDIR" ]; then - ETCDIR=$PREFIX/etc -fi - if [ -z "$MANDIR" ]; then MANDIR=$PREFIX/share/man fi @@ -135,7 +126,6 @@ RAGEL := ragel PREFIX := '$PREFIX' BINDIR := '$BINDIR' -ETCDIR := '$ETCDIR' EOF if [ $INSTALLMANPAGE -eq 1 ]; then @@ -174,7 +164,6 @@ cat > config.h <<EOF #define TARGET "$TARGET" #define PREFIX "$PREFIX" #define BINDIR "$BINDIR" -#define ETCDIR "$ETCDIR" #endif EOF |