github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

define dir_include/lib like other dirs. also define contrib developer dirs. 

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@54471 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
This commit is contained in:
NicJA 2017-04-09 02:33:01 +00:00
parent fb724239c8
commit ce8f794703
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/aros-contrib.cfg
View File

@ -5,3 +5,5 @@
include $(TOP)/config/make.cfg
-include $(GENDIR)/config/compiler.cfg
USE_CONTRIB_PATHS=yes

13
config/make.cfg.in
View File

@ -68,8 +68,8 @@ AROS_DIR_LIBRARIES := Libs
AROS_DIR_LOCALE := Locale
AROS_DIR_S := S
AROS_DIR_DEVELOPER := Developer
AROS_DIR_INCLUDE := $(AROS_DIR_DEVELOPER)/include
AROS_DIR_LIB := $(AROS_DIR_DEVELOPER)/lib
AROS_DIR_INCLUDE := include
AROS_DIR_LIB := lib
AROS_DIR_CONTRIB := Extras
ifeq ($(AROS_TARGET_ARCH),pc)
AROS_DIR_ARCH := boot/$(AROS_TARGET_ARCH)
@ -112,10 +112,13 @@ AROS_UTILITIES := $(AROSDIR)/Utilities
AROS_DEVELOPER := $(AROSDIR)/$(AROS_DIR_DEVELOPER)
AROS_DEBUG := $(AROS_DEVELOPER)/Debug
AROS_TESTS := $(AROS_DEBUG)/Tests
AROS_INCLUDES := $(AROSDIR)/$(AROS_DIR_INCLUDE)
AROS_LIB := $(AROSDIR)/$(AROS_DIR_LIB)
AROS_INCLUDES := $(AROS_DEVELOPER)/$(AROS_DIR_INCLUDE)
AROS_LIB := $(AROS_DEVELOPER)/$(AROS_DIR_LIB)
AROS_CONTRIB := $(AROSDIR)/$(AROS_DIR_CONTRIB)
AROS_CONTRIB := $(AROSDIR)/$(AROS_DIR_CONTRIB)
AROS_CONTRIB_DEVELOPER := $(AROS_CONTRIB)/$(AROS_DIR_DEVELOPER)
AROS_CONTRIB_INCLUDES := $(AROS_CONTRIB_DEVELOPER)/$(AROS_DIR_INCLUDE)
AROS_CONTRIB_LIB := $(AROS_CONTRIB_DEVELOPER)/$(AROS_DIR_LIB)
# The generated files all go under the GENDIR path
SCRIPTDIR := $(GENDIR)/scripts

4
config/make.tmpl
View File

@ -1829,7 +1829,7 @@ endif
ifneq (%(includedir),)
BD_INCDIR := %(includedir)
else
BD_INCDIR := %(prefix)/$(AROS_DIR_INCLUDE)
BD_INCDIR := %(prefix)/$(AROS_DIR_DEVELOPER)/$(AROS_DIR_INCLUDE)
endif
BD_LIBDEFSINC := %(objdir)/include/%(modname)_libdefs.h
BD_DEFLIBDEFSINC := %(objdir)/include/%(modname)_deflibdefs.h
@ -1950,7 +1950,7 @@ else
endif
ifeq (%(libdir),)
BD_LIBDIR := %(prefix)/$(AROS_DIR_LIB)
BD_LIBDIR := %(prefix)/$(AROS_DIR_DEVELOPER)/$(AROS_DIR_LIB)
else
BD_LIBDIR := %(libdir)
endif