Changeset 2666 for trunk/ports-make/common.gmk

Timestamp:

Mar 19, 2006, 3:38:41 AM (19 years ago)

Author:

bird

Message:

bindir and more.

File:

• trunk/ports-make/common.gmk (modified) (3 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 "      package=$(pm_package)"
         @echo "       prefix=$(pm_prefix)"
-        @echo "       insdir=$(pm_insdir)"
-        @echo "   pubdirbase=$(pm_pubdirbase)"
-        @echo "       pubdir=$(pm_pubdir)"
+        @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 "      GNUMAKE=$(GNUMAKE)"
-        @echo "      buildts=$(pm_buildts)"
-        
-                        
+
+
 ifeq ($(filter abspath,$(KMK_FEATURES)),abspath)
 pm_topdir               := $(abspath $(pm_topdir))
@@ -29 +35 @@
 pm_package              ?= $(notdir $(CURDIR))
 pm_prefix               ?= /usr
-pm_insdir               ?= $(pm_topdir)/out/$(BUILD_TARGET)/$(BUILD_TYPE)/dist$(pm_prefix)
-pm_pubdirbase   ?= $(pm_topdir)/out/$(BUILD_TARGET)/$(BUILD_TYPE)/packages/$(notdir $(CURDIR))
-pm_pubdir               ?= $(pm_pubdirbase)$(pm_prefix)
+pm_bindir               ?= $(pm_prefix)/bin
+pm_inst_base    ?= $(pm_topdir)/out/$(BUILD_TARGET)/$(BUILD_TYPE)/dist
+pm_inst_prefix  ?= $(pm_inst_base)$(pm_prefix)
+pm_inst_bindir  ?= $(pm_inst_base)$(pm_bindir)
+pm_pack_base    ?= $(pm_topdir)/out/$(BUILD_TARGET)/$(BUILD_TYPE)/packages/$(notdir $(CURDIR))
+pm_pack_prefix  ?= $(pm_pack_base)$(pm_prefix)
+pm_pack_bindir  ?= $(pm_pack_base)$(pm_bindir)
 pm_docdir               ?= usr/doc/$(pm_package)-$(PM_VERSION)
 pm_makefile             ?= $(pm_srcdir)/Makefile.kmk
@@ -42 +52 @@
 unexport pm_srcdir
 unexport pm_objdir
-unexport pm_insdir
-unexport pm_pubdir
+unexport pm_inst_prefix
+unexport pm_inst_bindir
+unexport pm_pack_prefix
+unexport pm_pack_bindir
+unexport pm_bindir
 unexport pm_prefix
 unexport pm_docdir