diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dpid/Makefile.am | 16 |
2 files changed, 10 insertions, 11 deletions
@@ -14,8 +14,9 @@ dillo-2.1 - Cleaned up resource embedding (forms) - Made cookierc parsing more robust. Patches: place (AKA corvid) -+- Switched SSL enabled to configure.in (./configure --enable-ssl). - Patch: Jeremy Henty ++- Switched SSL-enabled to configure.in (./configure --enable-ssl). + - Standardised the installation of dpid/dpidrc with auto* tools. + Patches: Jeremy Henty +- Allowed compilation with older machines by removing a few C99isms. - Added use of inttypes.h when stdint.h isn't found. Patches: Dan Fandrich diff --git a/dpid/Makefile.am b/dpid/Makefile.am index 938a6244..f838af86 100644 --- a/dpid/Makefile.am +++ b/dpid/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS=-DDPIDRC_SYS='"$(sysconfdir)/dpidrc"' bin_PROGRAMS = dpid dpid_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a -EXTRA_DIST = dpidc +EXTRA_DIST = dpidc dpidrc.in bin_SCRIPTS = dpidc dpid_SOURCES = \ @@ -21,11 +21,9 @@ dpid_SOURCES = \ main.c \ misc_new.c -install-data-local : - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc - echo >> $(DESTDIR)$(sysconfdir)/dpidrc - echo "proto.file=file/file.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc - echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc - echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc - echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc +sysconf_DATA = dpidrc +CLEANFILES = $(sysconf_DATA) + +dpidrc: dpidrc.in + sed -e 's|[@]libdir[@]|$(libdir)|' dpidrc.in > dpidrc + |