Makefile and configure patch

chrony-1.17-gentoo.diff (text/plain), 6.70 KB, created by Alexander Gretencord on 2002-03-23 12:27:53 UTC

--- chrony-1.17/Makefile.in	Sun Feb 17 23:23:12 2002
+++ Makefile.in	Sat Mar 23 19:09:34 2002
@@ -13,11 +13,15 @@
 # Makefile template
 
 INSTALL_PREFIX=@INSTALL_PREFIX@
+MANDIR=@MANDIR@
+INFORDIR=@INFORDIR@
 
 CC = @CC@
 CCWARNFLAGS = @CCWARNFLAGS@
 OPTFLAGS = @CFLAGS@ @EXTRA_DEFS@
 
+DESTDIR=
+
 OBJS = util.o sched.o regress.o local.o \
 	sys.o main.o ntp_io.o ntp_core.o ntp_sources.o \
 	sources.o sourcestats.o reference.o \
@@ -76,42 +80,41 @@
 # seem to vary between systems.
 
 install: chronyd chronyc
-	[ -d $(INSTALL_PREFIX) ] || mkdir $(INSTALL_PREFIX)
-	[ -d $(INSTALL_PREFIX)/sbin ] || mkdir $(INSTALL_PREFIX)/sbin
-	[ -d $(INSTALL_PREFIX)/bin ] || mkdir $(INSTALL_PREFIX)/bin
-	[ -d $(INSTALL_PREFIX)/doc ] || mkdir $(INSTALL_PREFIX)/doc
-	[ -d $(INSTALL_PREFIX)/man ] || mkdir $(INSTALL_PREFIX)/man
-	[ -d $(INSTALL_PREFIX)/man/man1 ] || mkdir $(INSTALL_PREFIX)/man/man1
-	[ -d $(INSTALL_PREFIX)/man/man5 ] || mkdir $(INSTALL_PREFIX)/man/man5
-	[ -d $(INSTALL_PREFIX)/man/man8 ] || mkdir $(INSTALL_PREFIX)/man/man8
-	[ -d $(INSTALL_PREFIX)/doc/chrony ] || mkdir $(INSTALL_PREFIX)/doc/chrony
-	cp chronyd $(INSTALL_PREFIX)/sbin/chronyd
-	chown root $(INSTALL_PREFIX)/sbin/chronyd
-	chmod 555 $(INSTALL_PREFIX)/sbin/chronyd
-	cp chronyc $(INSTALL_PREFIX)/bin/chronyc
-	chown root $(INSTALL_PREFIX)/bin/chronyc
-	chmod 555 $(INSTALL_PREFIX)/bin/chronyc
-	cp chrony.txt $(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	chown root $(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	chmod 444 $(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	cp COPYING $(INSTALL_PREFIX)/doc/chrony/COPYING
-	chown root $(INSTALL_PREFIX)/doc/chrony/COPYING
-	chmod 444 $(INSTALL_PREFIX)/doc/chrony/COPYING
-	cp README $(INSTALL_PREFIX)/doc/chrony/README
-	chown root $(INSTALL_PREFIX)/doc/chrony/README
-	chmod 444 $(INSTALL_PREFIX)/doc/chrony/README
-	cp chrony.1 $(INSTALL_PREFIX)/man/man1
-	chown root $(INSTALL_PREFIX)/man/man1/chrony.1
-	chmod 444 $(INSTALL_PREFIX)/man/man1/chrony.1
-	cp chronyc.1 $(INSTALL_PREFIX)/man/man1
-	chown root $(INSTALL_PREFIX)/man/man1/chronyc.1
-	chmod 444 $(INSTALL_PREFIX)/man/man1/chronyc.1
-	cp chronyd.8 $(INSTALL_PREFIX)/man/man8
-	chown root $(INSTALL_PREFIX)/man/man8/chronyd.8
-	chmod 444 $(INSTALL_PREFIX)/man/man8/chronyd.8
-	cp chrony.conf.5 $(INSTALL_PREFIX)/man/man5
-	chown root $(INSTALL_PREFIX)/man/man5/chrony.conf.5
-	chmod 444 $(INSTALL_PREFIX)/man/man5/chrony.conf.5
+	[ -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)/$(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
+	cp chronyd $(DESTDIR)/$(INSTALL_PREFIX)/sbin/chronyd
+	chown root $(DESTDIR)/$(INSTALL_PREFIX)/sbin/chronyd
+	chmod 555 $(DESTDIR)/$(INSTALL_PREFIX)/sbin/chronyd
+	cp chronyc $(DESTDIR)/$(INSTALL_PREFIX)/bin/chronyc
+	chown root $(DESTDIR)/$(INSTALL_PREFIX)/bin/chronyc
+	chmod 555 $(DESTDIR)/$(INSTALL_PREFIX)/bin/chronyc
+	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 COPYING $(DESTDIR)/$(INSTALL_PREFIX)/doc/chrony/COPYING
+	chown root $(DESTDIR)/$(INSTALL_PREFIX)/doc/chrony/COPYING
+	chmod 444 $(DESTDIR)/$(INSTALL_PREFIX)/doc/chrony/COPYING
+	cp README $(DESTDIR)/$(INSTALL_PREFIX)/doc/chrony/README
+	chown root $(DESTDIR)/$(INSTALL_PREFIX)/doc/chrony/README
+	chmod 444 $(DESTDIR)/$(INSTALL_PREFIX)/doc/chrony/README
+	cp chrony.1 $(DESTDIR)/$(MANDIR)/man1
+	chown root $(DESTDIR)/$(MANDIR)/man1/chrony.1
+	chmod 444 $(DESTDIR)/$(MANDIR)/man1/chrony.1
+	cp chronyc.1 $(DESTDIR)/$(MANDIR)/man1
+	chown root $(DESTDIR)/$(MANDIR)/man1/chronyc.1
+	chmod 444 $(DESTDIR)/$(MANDIR)/man1/chronyc.1
+	cp chronyd.8 $(DESTDIR)/$(MANDIR)/man8
+	chown root $(DESTDIR)/$(MANDIR)/man8/chronyd.8
+	chmod 444 $(DESTDIR)/$(MANDIR)/man8/chronyd.8
+	cp chrony.conf.5 $(DESTDIR)/$(MANDIR)/man5
+	chown root $(DESTDIR)/$(MANDIR)/man5/chrony.conf.5
+	chmod 444 $(DESTDIR)/$(MANDIR)/man5/chrony.conf.5
 
 %.o : %.c
 	$(CC) $(CFLAGS) $(DEFS) -c $<
@@ -125,17 +128,17 @@
 MAKEINFO:=makeinfo
 
 install-docs : docs
-	[ -d $(INSTALL_PREFIX)/doc ] || mkdir $(INSTALL_PREFIX)/doc
-	cp chrony.txt $(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	chown root $(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	chmod 444 $(INSTALL_PREFIX)/doc/chrony/chrony.txt
-	cp chrony.html $(INSTALL_PREFIX)/doc/chrony/chrony.html
-	chown root $(INSTALL_PREFIX)/doc/chrony/chrony.html
-	chmod 444 $(INSTALL_PREFIX)/doc/chrony/chrony.html
-	[ -d $(INSTALL_PREFIX)/info ] || mkdir $(INSTALL_PREFIX)/info
-	cp chrony.info* $(INSTALL_PREFIX)/info
-	chown root $(INSTALL_PREFIX)/info/chrony.info*
-	chmod 444 $(INSTALL_PREFIX)/info/chrony.info*
+	[ -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)/$(INFODIR) ] || mkdir -p $(DESTDIR)/$(INFODIR)
+	cp chrony.info* $(DESTDIR)/$(INFODIR)
+	chown root $(DESTDIR)/$(INFODIR)/chrony.info*
+	chmod 444 $(DESTDIR)/$(INFODIR)/chrony.info*
 
 docs : chrony.txt chrony.html chrony.info
 
--- chrony-1.17/configure	Sun Feb 17 23:23:15 2002
+++ configure	Sat Mar 23 19:09:46 2002
@@ -25,6 +25,8 @@
 EXTRA_OBJECTS=""
 EXTRA_DEFS=""
 INSTALL_PREFIX=/usr/local
+MANDIR=${INSTALL_PREFIX}/man
+INFODIR=${INSTALL_PREFIX}/info
 SYSDEFS=""
 
 # Support for readline (on by default)
@@ -54,6 +56,12 @@
     --with-ncurses-library=* )
       ncurses_lib=-L`echo $option | sed -e 's/^.*=//;'`
     ;;
+    --infodir=* )
+      INFODIR=`echo $option | sed -e 's/^.*=//;'`
+    ;;
+    --mandir=* )
+      MANDIR=`echo $option | sed -e 's/^.*=//;'`
+    ;;
     * )
     echo "Unrecognized option : " $option
     esac
@@ -151,5 +159,7 @@
 	s%@EXTRA_CLI_LIBS@%${EXTRA_CLI_LIBS}%;\
   s%@READLINE_COMPILE@%${READLINE_COMPILE}%;\
   s%@READLINE_LINK@%${READLINE_LINK}%;\
-	s%@INSTALL_PREFIX@%${INSTALL_PREFIX}%;"\
+	s%@INSTALL_PREFIX@%${INSTALL_PREFIX}%;\
+	s%@MANDIR@%${MANDIR}%;\
+	s%@INFODIR@%${INFODIR}%;"\
 	< Makefile.in > Makefile