Changeset 12279

Timestamp:

Mar 6, 2007, 10:20:28 AM (19 years ago)

Author:

jhoblitt

Message:

fix ipprc.config.in default PATH expansion

Location:

trunk/ippconfig

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• ipprc.config.in (modified) (1 diff)

trunk/ippconfig/Makefile.am

@@ -34 +34 @@
 # 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'
+        -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+        -e 's|@prefix[@]|$(prefix)|g'
 
 ipprc.config dvo.site: Makefile

trunk/ippconfig/configure.ac

@@ -8 +8 @@
 
 AC_PROG_INSTALL
-
-IPP_CONFIG_DIR="${datadir}/ippconfig"
-AC_SUBST(IPP_CONFIG_DIR)
 
 AC_CONFIG_FILES([

trunk/ippconfig/ipprc.config.in

@@ -2 +2 @@
 
 # Default search path for configuration files
-PATH            STR     @IPP_CONFIG_DIR@:$HOME/.ipp:.
+PATH            STR     @pkgdatadir@:$HOME/.ipp:.
 
 # place your data directories here and refer to as path://PATH/remainder