$NetBSD: patch-aa,v 1.2 2004/11/30 11:26:59 hannken Exp $ --- Makefile.in.orig 2003-09-20 00:48:26.000000000 +0200 +++ Makefile.in @@ -60,7 +60,7 @@ EXTRA_CLI_LIBS=@EXTRA_CLI_LIBS@ DEFS=@SYSDEFS@ -CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) +CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) -DDEFAULT_CONF_FILE=\"$(INSTALL_PREFIX)/etc/chrony.conf\" # Until we have a main procedure we can link, just build object files # to test compilation @@ -68,10 +68,10 @@ CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) all : chronyd chronyc chronyd : $(OBJS) $(EXTRA_OBJS) - $(CC) $(OPTFLAGS) -o chronyd $(OBJS) $(EXTRA_OBJS) $(LIBS) $(EXTRA_LIBS) + $(CC) $(LDFLAGS) $(OPTFLAGS) -o chronyd $(OBJS) $(EXTRA_OBJS) $(LIBS) $(EXTRA_LIBS) chronyc : $(CLI_OBJS) - $(CC) $(OPTFLAGS) -o chronyc $(CLI_OBJS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS) + $(CC) $(LDFLAGS) $(OPTFLAGS) -o chronyc $(CLI_OBJS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS) client.o : client.c $(CC) $(CFLAGS) $(DEFS) @READLINE_COMPILE@ -c $< @@ -93,34 +93,18 @@ version.h : version.txt # 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)$(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 - cp chrony.1 $(DESTDIR)$(MANDIR)/man1 - chmod 444 $(DESTDIR)$(MANDIR)/man1/chrony.1 - cp chronyc.1 $(DESTDIR)$(MANDIR)/man1 - chmod 444 $(DESTDIR)$(MANDIR)/man1/chronyc.1 - cp chronyd.8 $(DESTDIR)$(MANDIR)/man8 - chmod 444 $(DESTDIR)$(MANDIR)/man8/chronyd.8 - cp chrony.conf.5 $(DESTDIR)$(MANDIR)/man5 - chmod 444 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5 + [ -d $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony + $(INSTALL_PROGRAM) chronyd $(DESTDIR)$(INSTALL_PREFIX)/sbin + $(INSTALL_PROGRAM) chronyc $(DESTDIR)$(INSTALL_PREFIX)/bin + $(INSTALL_DATA) chrony.txt $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony + $(INSTALL_DATA) COPYING $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony + $(INSTALL_DATA) README $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony + $(INSTALL_MAN) chrony.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) chronyc.1 $(DESTDIR)$(MANDIR)/man1 + sed 's|@PREFIX@|$(INSTALL_PREFIX)|g' chronyd.8 > chronyd.0 + $(INSTALL_MAN) chronyd.0 $(DESTDIR)$(MANDIR)/man8/chronyd.8 + sed 's|@PREFIX@|$(INSTALL_PREFIX)|g' chrony.conf.5 > chrony.conf.0 + $(INSTALL_MAN) chrony.conf.0 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5 %.o : %.c $(CC) $(CFLAGS) $(DEFS) -c $<