Changeset 3450 for trunk/ports-make/common.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/common.gmk (modified) (2 diffs)

trunk/ports-make/common.gmk

@@ -5 +5 @@
 
 show::
-        @echo "      buildts=$(pm_buildts)"
-        @echo "      package=$(pm_package)"
-        @echo "       topdir=$(pm_topdir)"
-        @echo "       srcdir=$(pm_srcdir)"
-        @echo "       objdir=$(pm_objdir)"
-        @echo "       prefix=$(pm_prefix)"
-        @echo "       bindir=$(pm_bindir)"
-        @echo "    inst_base=$(pm_inst_base)"
-        @echo "  inst_prefix=$(pm_inst_prefix)"
-        @echo "  inst_bindir=$(pm_inst_bindir)"
-        @echo "    pack_base=$(pm_pack_base)"
-        @echo "  pack_prefix=$(pm_pack_prefix)"
-        @echo "  pack_bindir=$(pm_pack_bindir)"
-        @echo "       docdir=$(pm_docdir)"
-        @echo "         MAKE=$(MAKE)"
-        @echo "      GNUMAKE=$(GNUMAKE)"
-        @echo "    MAKESHELL=$(MAKESHELL)"
-        @echo "     makefile=$(pm_makefile)"
-        @echo "makefile_list=$(MAKEFILE_LIST)"
+        @echo "        buildts=$(pm_buildts)"
+        @echo "        package=$(pm_package)"
+        @echo "         topdir=$(pm_topdir)"
+        @echo "         srcdir=$(pm_srcdir)"
+        @echo "         objdir=$(pm_objdir)"
+        @echo "         prefix=$(pm_prefix)"
+        @echo "        eprefix=$(pm_eprefix)"
+        @echo "     sysconfdir=$(pm_sysconfdir)"
+        @echo "         bindir=$(pm_bindir)"
+        @echo "      inst_base=$(pm_inst_base)"
+        @echo "   inst_eprefix=$(pm_inst_eprefix)"
+        @echo "inst_sysconfdir=$(pm_inst_sysconfdir)"
+        @echo "    inst_prefix=$(pm_inst_prefix)"
+        @echo "    inst_bindir=$(pm_inst_bindir)"
+        @echo "      pack_base=$(pm_pack_base)"
+        @echo "   pack_eprefix=$(pm_pack_eprefix)"
+        @echo "pack_sysconfdir=$(pm_pack_sysconfdir)"
+        @echo "    pack_prefix=$(pm_pack_prefix)"
+        @echo "    pack_bindir=$(pm_pack_bindir)"
+        @echo "         docdir=$(pm_docdir)"
+        @echo "           MAKE=$(MAKE)"
+        @echo "        GNUMAKE=$(GNUMAKE)"
+        @echo "      MAKESHELL=$(MAKESHELL)"
+        @echo "       makefile=$(pm_makefile)"
+        @echo "  makefile_list=$(MAKEFILE_LIST)"
 
 
@@ -34 +40 @@
 pm_objdir               ?= $(pm_topdir)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/ports/$(notdir $(CURDIR))
 pm_package              ?= $(notdir $(CURDIR))
+
 pm_prefix               ?= /@unixroot/usr
-pm_bindir               ?= $(pm_prefix)/bin
+pm_eprefix      ?= /@unixroot/usr
+pm_sysconfdir   ?= /@unixroot/etc
+pm_bindir               ?= $(pm_eprefix)/bin
+
 pm_inst_base    ?= $(pm_topdir)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/dist
 pm_inst_prefix  ?= $(pm_inst_base)$(subst /@unixroot,,$(pm_prefix))
+pm_inst_eprefix ?= $(pm_inst_base)$(subst /@unixroot,,$(pm_eprefix))
+pm_inst_sysconfdir ?= $(pm_inst_base)$(subst /@unixroot,,$(pm_sysconfdir))
 pm_inst_bindir  ?= $(pm_inst_base)$(subst /@unixroot,,$(pm_bindir))
+
 pm_pack_base    ?= $(pm_topdir)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/packages/$(notdir $(CURDIR))
 pm_pack_prefix  ?= $(pm_pack_base)$(subst /@unixroot,,$(pm_prefix))
+pm_pack_eprefix ?= $(pm_pack_base)$(subst /@unixroot,,$(pm_eprefix))
+pm_pack_sysconfdir ?= $(pm_pack_base)$(subst /@unixroot,,$(pm_sysconfdir))
 pm_pack_bindir  ?= $(pm_pack_base)$(subst /@unixroot,,$(pm_bindir))
+
 pm_docdir               ?= usr/doc/$(pm_package)-$(PM_VERSION)
 pm_makefile             ?= $(pm_srcdir)/Makefile.kmk