Changeset 11836

Timestamp:

Feb 15, 2007, 1:16:19 PM (19 years ago)

Author:

Paul Price

Message:

According to the autoconf manual (section 4.7.2), you should NOT use AC_CONFIG_FILES to do variable substitution in anything except Makefiles (it does not completely qualify the path, i.e., $datadir resolves to $prefix/whatever). Instead, it recommends using sed within a Makefile. Implemented this to solve problem with getting $prefix in installed configuration files.

Location:

trunk/ippconfig

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)

trunk/ippconfig/Makefile.am

@@ -30 +30 @@
 
 ACLOCAL_AMFLAGS = -I m4
+
+# From the autoconf manual, section 4.7.2 "Installation Directory Variables"
+edit = sed \
+        -e 's|@datadir[@]|$(datadir)|g' \
+        -e 's|@prefix[@]|$(prefix)|g' \
+        -e 's|@IPP_CONFIG_DIR[@]|$(IPP_CONFIG_DIR)|g'
+
+ipprc.config dvo.site: Makefile
+        rm -f $@
+        $(edit) '$(srcdir)/$@.in' > $@
+
+ipprc.config: $(srcdir)/ipprc.config.in
+dvo.site: $(srcdir)/dvo.site.in

trunk/ippconfig/configure.ac

@@ -19 +19 @@
   megacam/Makefile
   simple/Makefile
-  ipprc.config
-  dvo.site
 ])
 AC_OUTPUT