changeset 439:db5ae912fcb4

- Standardised the installation of dpid/dpidrc with auto* tools.
author jcid
date Mon, 27 Oct 2008 15:54:00 +0100
parents 29c514f5ce00
children b718c1604603
files ChangeLog dpid/Makefile.am
diffstat 2 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Oct 26 19:21:51 2008 +0100
+++ b/ChangeLog	Mon Oct 27 15:54:00 2008 +0100
@@ -14,8 +14,9 @@
  - 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
--- a/dpid/Makefile.am	Sun Oct 26 19:21:51 2008 +0100
+++ b/dpid/Makefile.am	Mon Oct 27 15:54:00 2008 +0100
@@ -3,7 +3,7 @@
 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 @@
 	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
+