Index: Makefile.in =================================================================== RCS file: /cvsroot/webfwlog/webfwlog/Makefile.in,v retrieving revision 1.2 diff -u -r1.2 Makefile.in --- Makefile.in 9 Nov 2004 20:37:38 -0000 1.2 +++ Makefile.in 16 Nov 2004 06:56:47 -0000 @@ -19,30 +19,30 @@ @for d in $(SUBDIRS); do cd $$d; if $(MAKE) $@; then :; else exit 1; fi; cd ..; done; install: all - @if [ -f $(sysconfdir)/webfwlog.conf ]; \ + @if [ -f $(DESTDIR)$(sysconfdir)/webfwlog.conf ]; \ then \ - if $(INSTALL_DATA) webfwlog.conf $(sysconfdir)/webfwlog.conf.new; \ + if $(INSTALL_DATA) webfwlog.conf $(DESTDIR)$(sysconfdir)/webfwlog.conf.new; \ then :; else exit 1; fi; \ - echo installed $(sysconfdir)/webfwlog.conf as webfwlog.conf.new; \ + echo installed $(DESTDIR)$(sysconfdir)/webfwlog.conf as webfwlog.conf.new; \ else \ - if $(INSTALL_DATA) webfwlog.conf $(sysconfdir)/webfwlog.conf; \ + if $(INSTALL_DATA) webfwlog.conf $(DESTDIR)$(sysconfdir)/webfwlog.conf; \ then :; else exit 1; fi; \ - echo installed $(sysconfdir)/webfwlog.conf; \ + echo installed $(DESTDIR)$(sysconfdir)/webfwlog.conf; \ fi - @if [ -d $(HTML_DOC_ROOT) ]; \ + @if [ -d $(DESTDIR)$(HTML_DOC_ROOT) ]; \ then \ - if $(INSTALL_SCRIPT) -d $(HTML_DOC_ROOT)/webfwlog \ - && $(INSTALL_SCRIPT) -d $(HTML_DOC_ROOT)/webfwlog/include; \ + if $(INSTALL_SCRIPT) -d $(DESTDIR)$(HTML_DOC_ROOT)/webfwlog \ + && $(INSTALL_SCRIPT) -d $(DESTDIR)$(HTML_DOC_ROOT)/webfwlog/include; \ then :; else exit 1; fi; \ - if $(INSTALL_DATA) webfwlog/webfwlog.php $(HTML_DOC_ROOT)/webfwlog; \ + if $(INSTALL_DATA) webfwlog/webfwlog.php $(DESTDIR)$(HTML_DOC_ROOT)/webfwlog; \ then :; else exit 1; fi; \ - if $(INSTALL_DATA) webfwlog/style.css $(HTML_DOC_ROOT)/webfwlog; \ + if $(INSTALL_DATA) webfwlog/style.css $(DESTDIR)$(HTML_DOC_ROOT)/webfwlog; \ then :; else exit 1; fi; \ - if $(INSTALL_DATA) webfwlog/include/*.php $(HTML_DOC_ROOT)/webfwlog/include; \ + if $(INSTALL_DATA) webfwlog/include/*.php $(DESTDIR)$(HTML_DOC_ROOT)/webfwlog/include; \ then :; else exit 1; fi; \ - echo installed webfwlog in $(HTML_DOC_ROOT)/webfwlog; \ + echo installed webfwlog in $(DESTDIR)$(HTML_DOC_ROOT)/webfwlog; \ else \ - echo $(HTML_DOC_ROOT) is not a directory ; \ + echo $(DESTDIR)$(HTML_DOC_ROOT) is not a directory ; \ exit 1; \ fi @for d in $(SUBDIRS); do cd $$d; if $(MAKE) $@; then :; else exit 1; fi; cd ..; done; Index: syslog/Makefile.in =================================================================== RCS file: /cvsroot/webfwlog/webfwlog/syslog/Makefile.in,v retrieving revision 1.2 diff -u -r1.2 Makefile.in --- syslog/Makefile.in 9 Nov 2004 20:37:38 -0000 1.2 +++ syslog/Makefile.in 16 Nov 2004 06:56:47 -0000 @@ -42,8 +42,8 @@ @mv -f y.tab.c getdate.c install: all - @if $(INSTALL_PROGRAM) wfwl_syslog $(bindir)/wfwl_syslog ; then :; else exit 1; fi; - @echo installed $(bindir)/wfwl_syslog; + @if $(INSTALL_PROGRAM) wfwl_syslog $(DESTDIR)$(bindir)/wfwl_syslog ; then :; else exit 1; fi; + @echo installed $(DESTDIR)$(bindir)/wfwl_syslog; uninstall: @rm -f $(bindir)/wfwl_syslog