From 4d6156b54965106319d46e2157981fb5ea268c74 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Fri, 27 Nov 2009 13:11:29 +0100
Subject: [PATCH] Add bindir, sbindir, docdir options to configure

---
 Makefile.in | 51 ++++++++++++++++++++++++++-------------------------
 configure   | 28 +++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 012be41..e5b2cbe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,9 +25,11 @@
 #
 # Makefile template
 
-INSTALL_PREFIX=@INSTALL_PREFIX@
+BINDIR=@BINDIR@
+SBINDIR=@SBINDIR@
 MANDIR=@MANDIR@
 INFODIR=@INFODIR@
+DOCDIR=@DOCDIR@
 
 CC = @CC@
 CCWARNFLAGS = @CCWARNFLAGS@
@@ -97,26 +99,25 @@ getdate :
 # seem to vary between systems.
 
 install: chronyd chronyc
-	[ -d $(DESTDIR)$(INSTALL_PREFIX) ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)
-	[ -d $(DESTDIR)$(INSTALL_PREFIX)/sbin ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/sbin
-	[ -d $(DESTDIR)$(INSTALL_PREFIX)/bin ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/bin
-	[ -d $(DESTDIR)$(INSTALL_PREFIX)/doc ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/doc
+	[ -d $(DESTDIR)$(SBINDIR) ] || mkdir -p $(DESTDIR)$(SBINDIR)
+	[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
+	[ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
 	[ -d $(DESTDIR)$(MANDIR)/man1 ] || mkdir -p $(DESTDIR)$(MANDIR)/man1
 	[ -d $(DESTDIR)$(MANDIR)/man5 ] || mkdir -p $(DESTDIR)$(MANDIR)/man5
 	[ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8
-	[ -d $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony
-	if [ -f $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd ]; then rm -f $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd ; fi
-	if [ -f $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc ]; then rm -f $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc ; fi
-	cp chronyd $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd
-	chmod 555 $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd
-	cp chronyc $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc
-	chmod 555 $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc
-	cp chrony.txt $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	chmod 444 $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	cp COPYING $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/COPYING
-	chmod 444 $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/COPYING
-	cp README $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/README
-	chmod 444 $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/README
+	[ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
+	if [ -f $(DESTDIR)$(SBINDIR)/chronyd ]; then rm -f $(DESTDIR)$(SBINDIR)/chronyd ; fi
+	if [ -f $(DESTDIR)$(BINDIR)/chronyc ]; then rm -f $(DESTDIR)$(BINDIR)/chronyc ; fi
+	cp chronyd $(DESTDIR)$(SBINDIR)/chronyd
+	chmod 555 $(DESTDIR)$(SBINDIR)/chronyd
+	cp chronyc $(DESTDIR)$(BINDIR)/chronyc
+	chmod 555 $(DESTDIR)$(BINDIR)/chronyc
+	cp chrony.txt $(DESTDIR)$(DOCDIR)/chrony.txt
+	chmod 444 $(DESTDIR)$(DOCDIR)/chrony.txt
+	cp COPYING $(DESTDIR)$(DOCDIR)/COPYING
+	chmod 444 $(DESTDIR)$(DOCDIR)/COPYING
+	cp README $(DESTDIR)$(DOCDIR)/README
+	chmod 444 $(DESTDIR)$(DOCDIR)/README
 	cp chrony.1 $(DESTDIR)$(MANDIR)/man1
 	chmod 444 $(DESTDIR)$(MANDIR)/man1/chrony.1
 	cp chronyc.1 $(DESTDIR)$(MANDIR)/man1
@@ -138,13 +139,13 @@ main.o logging.o client.o : version.h
 MAKEINFO:=makeinfo
 
 install-docs : docs
-	[ -d $(DESTDIR)$(INSTALL_PREFIX)/doc ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/doc
-	cp chrony.txt $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	chown root $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	chmod 444 $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	cp chrony.html $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.html
-	chown root $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.html
-	chmod 444 $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.html
+	[ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
+	cp chrony.txt $(DESTDIR)$(DOCDIR)/chrony.txt
+	chown root $(DESTDIR)$(DOCDIR)/chrony.txt
+	chmod 444 $(DESTDIR)$(DOCDIR)/chrony.txt
+	cp chrony.html $(DESTDIR)$(DOCDIR)/chrony.html
+	chown root $(DESTDIR)$(DOCDIR)/chrony.html
+	chmod 444 $(DESTDIR)$(DOCDIR)/chrony.html
 	[ -d $(DESTDIR)$(INFODIR) ] || mkdir -p $(DESTDIR)$(INFODIR)
 	cp chrony.info* $(DESTDIR)$(INFODIR)
 	chown root $(DESTDIR)$(INFODIR)/chrony.info*
diff --git a/configure b/configure
index ba937d2..0693e14 100755
--- a/configure
+++ b/configure
@@ -191,8 +191,11 @@ For better control, use the options below.
   --enable-linuxcaps     Enable Linux capabilities support
 
 Fine tuning of the installation directories:
+  --bindir=DIR           user executables [PREFIX/bin]
+  --sbindir=DIR          system admin executables [PREFIX/sbin]
   --infodir=DIR          info documentation [PREFIX/info]
   --mandir=DIR           man documentation [PREFIX/man]
+  --docdir=DIR           documentation root [PREFIX/doc/chrony]
 
 Overriding system detection when cross-compiling:
   --host-system=OS       Specify system name (uname -s)
@@ -268,12 +271,21 @@ do
     --with-ncurses-library=* )
       ncurses_lib=-L`echo $option | sed -e 's/^.*=//;'`
     ;;
+    --bindir=* )
+      SETBINDIR=`echo $option | sed -e 's/^.*=//;'`
+    ;;
+    --sbindir=* )
+      SETSBINDIR=`echo $option | sed -e 's/^.*=//;'`
+    ;;
     --infodir=* )
       SETINFODIR=`echo $option | sed -e 's/^.*=//;'`
     ;;
     --mandir=* )
       SETMANDIR=`echo $option | sed -e 's/^.*=//;'`
     ;;
+    --docdir=* )
+      SETDOCDIR=`echo $option | sed -e 's/^.*=//;'`
+    ;;
     --disable-rtc)
       feat_rtc=0
     ;;
@@ -447,14 +459,26 @@ else
   READLINE_LINK=""
 fi
 
+BINDIR=${INSTALL_PREFIX}/bin
+SBINDIR=${INSTALL_PREFIX}/sbin
 MANDIR=${INSTALL_PREFIX}/man
 INFODIR=${INSTALL_PREFIX}/info
+DOCDIR=${INSTALL_PREFIX}/doc/chrony
+if [ "x$SETBINDIR" != "x" ]; then
+  BINDIR=$SETBINDIR
+fi
+if [ "x$SETSBINDIR" != "x" ]; then
+  SBINDIR=$SETSBINDIR
+fi
 if [ "x$SETINFODIR" != "x" ]; then
   INFODIR=$SETINFODIR
 fi
 if [ "x$SETMANDIR" != "x" ]; then
   MANDIR=$SETMANDIR
 fi
+if [ "x$SETDOCDIR" != "x" ]; then
+  DOCDIR=$SETDOCDIR
+fi
 
 sed -e "s%@EXTRA_OBJECTS@%${EXTRA_OBJECTS}%;\
 	s%@CC@%${MYCC}%;\
@@ -469,7 +493,9 @@ sed -e "s%@EXTRA_OBJECTS@%${EXTRA_OBJECTS}%;\
 	s%@EXTRA_CLI_LIBS@%${EXTRA_CLI_LIBS}%;\
 	s%@READLINE_COMPILE@%${READLINE_COMPILE}%;\
 	s%@READLINE_LINK@%${READLINE_LINK}%;\
-	s%@INSTALL_PREFIX@%${INSTALL_PREFIX}%;\
+	s%@BINDIR@%${BINDIR}%;\
+	s%@SBINDIR@%${SBINDIR}%;\
+	s%@DOCDIR@%${DOCDIR}%;\
 	s%@MANDIR@%${MANDIR}%;\
 	s%@INFODIR@%${INFODIR}%;"\
 	< Makefile.in > Makefile