Changeset 3450 for trunk/ports-make/rules.gmk

Timestamp:

Jun 16, 2007, 2:34:09 PM (18 years ago)

Author:

bird

Message:

more config options. make sure sysconfdir points at etc

File:

• trunk/ports-make/rules.gmk (modified) (5 diffs)

trunk/ports-make/rules.gmk

@@ -11 +11 @@
 #
 DO_CONFIG        = CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" AR="$(AR)" RANLIB="$(RANLIB)" $(SET_CONFIG) \
-                           $(pm_srcdir)/configure --prefix=$(pm_prefix) --bindir=$(pm_bindir)
+                           $(pm_srcdir)/configure --prefix=$(pm_prefix) --exec-prefix=$(pm_eprefix) --sysconfdir=$(pm_sysconfdir) --bindir=$(pm_bindir)
 ifndef NO_DO_CONFIG_CACHE
 DO_CONFIG       += --cache-file=./configure.cache
@@ -29 +29 @@
 DO_MAKE         += CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)"
 endif
+
+# what we have to preserve.
+PRESERVED_MAKE_VARS = \
+        pm_objdir="$(pm_objdir)" pm_srcdir="$(pm_srcdir)" pm_topdir="$(pm_topdir)" pm_package="$(pm_package)" \
+        pm_pack_prefix="$(pm_pack_prefix)" pm_pack_eprefix="$(pm_pack_eprefix)" pm_pack_base="$(pm_pack_base)" pm_pack_bindir="$(pm_pack_bindir)" \
+        pm_inst_prefix="$(pm_inst_prefix)" pm_inst_eprefix="$(pm_inst_eprefix)" pm_inst_base="$(pm_inst_base)" pm_inst_bindir="$(pm_inst_bindir)"
 
 #
@@ -53 +59 @@
 config build dep check dist install packing nothing:
         mkdir -p $(pm_objdir)
-        ( $(MAKE) -C $(pm_objdir) -f $(pm_makefile) \
-                pm_objdir="$(pm_objdir)" pm_srcdir="$(pm_srcdir)" pm_topdir="$(pm_topdir)" pm_package="$(pm_package)" \
-                pm_pack_prefix="$(pm_pack_prefix)" pm_pack_base="$(pm_pack_base)" pm_pack_bindir="$(pm_pack_bindir)" \
-                pm_inst_prefix="$(pm_inst_prefix)" pm_inst_base="$(pm_inst_base)" pm_inst_bindir="$(pm_inst_bindir)" \
+        ( $(MAKE) -C $(pm_objdir) -f $(pm_makefile) $(PRESERVED_MAKE_VARS) \
                 do-$@ 2>&1 ; echo "$$?" > $(pm_objdir)/.pm_rc_$@ ) | tee $(pm_objdir)/$(pm_buildts)-$@.log ; exit `cat $(pm_objdir)/.pm_rc_$@`
 
 clean distclean shell:
         mkdir -p $(pm_objdir)
-        $(MAKE) -C $(pm_objdir) -f $(pm_makefile) \
-                pm_objdir="$(pm_objdir)" pm_srcdir="$(pm_srcdir)" pm_topdir="$(pm_topdir)" pm_package="$(pm_package)" \
-                pm_pack_prefix="$(pm_pack_prefix)" pm_pack_base="$(pm_pack_base)" pm_pack_bindir="$(pm_pack_bindir)" \
-                pm_inst_prefix="$(pm_inst_prefix)" pm_inst_base="$(pm_inst_base)" pm_inst_bindir="$(pm_inst_bindir)" \
+        $(MAKE) -C $(pm_objdir) -f $(pm_makefile) $(PRESERVED_MAKE_VARS) \
                 do-$@
 
@@ -131 +131 @@
 endif
 endif
-        $(DO_MAKE) $(OPT_PACKING) prefix="$(pm_pack_prefix)" bindir="$(pm_pack_bindir)" install
+        $(DO_MAKE) $(OPT_PACKING) prefix="$(pm_pack_prefix)" eprefix="$(pm_pack_eprefix)" sysconfdir="$(pm_pack_sysconfdir)" bindir="$(pm_pack_bindir)" install
 ifdef PM_DOCS
         mkdir -p $(pm_pack_base)/$(pm_docdir)
@@ -147 +147 @@
 #
 do-install:
-        $(DO_MAKE) $(OPT_INSTALL) prefix="$(pm_inst_prefix)" bindir="$(pm_inst_bindir)" install
+        $(DO_MAKE) $(OPT_INSTALL) prefix="$(pm_inst_prefix)" eprefix="$(pm_inst_eprefix)" sysconfdir="$(pm_inst_sysconfdir)" bindir="$(pm_inst_bindir)" install
 ifdef PM_DOCS
         mkdir -p $(pm_inst_base)/$(pm_docdir)