Changeset 3409 for trunk

Timestamp:

Jun 11, 2007, 3:11:16 AM (18 years ago)

Author:

bird

Message:

fixed some paths.

File:

• trunk/ports-make/common.gmk (modified) (2 diffs)

trunk/ports-make/common.gmk

@@ -32 +32 @@
 endif
 pm_srcdir               ?= $(CURDIR)
-pm_objdir               ?= $(pm_topdir)/out/$(BUILD_TARGET)/$(BUILD_TYPE)/obj/$(notdir $(CURDIR))
+pm_objdir               ?= $(pm_topdir)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/ports/$(notdir $(CURDIR))
 pm_package              ?= $(notdir $(CURDIR))
-pm_prefix               ?= /usr
+pm_prefix               ?= /@unixroot/usr
 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_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_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_bindir  ?= $(pm_pack_base)$(subst /@unixroot,,$(pm_bindir))
 pm_docdir               ?= usr/doc/$(pm_package)-$(PM_VERSION)
 pm_makefile             ?= $(pm_srcdir)/Makefile.kmk
@@ -47 +47 @@
 pm_buildts              := $(shell date +"%Y%m%d-%H%M%S")
 endif
-GNUMAKE         ?= make
+GNUMAKE         ?= kmk_gmake
 
 unexport pm_topdir