فهرست منبع

Makefile: runbasedir should not use PREFIX.
kamcmd: add missing new RUN_DIR definition

Victor Seva 10 سال پیش
والد
کامیت
d323d0cfdf
2فایلهای تغییر یافته به همراه2 افزوده شده و 8 حذف شده
  1. 1 8
      Makefile.defs
  2. 1 0
      utils/kamcmd/Makefile

+ 1 - 8
Makefile.defs

@@ -431,14 +431,7 @@ doxygen_dir=doc/doxygen
 
 BASEDIR ?= $(DESTDIR)
 basedir = $(BASEDIR)
-
-ifeq ($(BASEDIR),)
-RUNBASEDIR ?= $(PREFIX)
-else
-RUNBASEDIR ?= $(BASEDIR)/$(PREFIX)
-endif
-
-runbasedir = $(RUNBASEDIR)
+runbasedir = $(BASEDIR)
 
 # install location
 PREFIX ?= $(LOCALBASE)

+ 1 - 0
utils/kamcmd/Makefile

@@ -28,6 +28,7 @@ endif #ifneq (,$(MAKECMDGOALS))
 # erase common DEFS (not needed)
 C_DEFS:=
 DEFS:= -DNAME='"$(NAME)"' -DSRNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -D__OS_$(OS) \
+		-DRUN_DIR='"$(run_target)"' \
 		$(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS))
 
 # use proper libs (we can't rely on LIBS value since we might be called