beebf9
build system: Makefile.in: always include cfgdefs.mk & usrdefs.mk.
Authored and Committed by 
midipix
6 years ago
Makefile.in
CHANGED
|
@@ -119,13 +119,8 @@ include $(PROJECT_DIR)/sysinfo/compiler/$(COMPILER).mk
|
|
|
119
119
|
include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk
|
|
120
120
|
include $(PROJECT_DIR)/sysinfo/os/$(OS).mk
|
|
121
121
|
|
|
122
|
-
ifeq ($(USE_CUSTOM_CFGDEFS),yes)
|
|
123
122
|
include ./cfgdefs.mk
|
|
124
|
-
endif
|
|
125
|
-
|
|
126
|
-
ifeq ($(USE_CUSTOM_USRDEFS),yes)
|
|
127
123
|
include ./usrdefs.mk
|
|
128
|
-
endif
|
|
129
124
|
|
|
130
125
|
include $(PROJECT_DIR)/sofort/defs.mk
|
|
131
126
|
include $(PROJECT_DIR)/sofort/flavor.mk
|
configure
CHANGED
|
@@ -63,13 +63,18 @@ init_vars()
|
|
|
63
63
|
|
|
64
64
|
# project-specific config definitions
|
|
65
65
|
if [ _$mb_use_custom_cfgdefs = _yes ]; then
|
|
66
|
-
cat
|
|
66
|
+
cat $mb_project_dir/sofort/cfgdefs.in \
|
|
67
|
+
> cfgdefs.mk
|
|
68
|
+
else
|
|
69
|
+
printf '%s %s\n\n' \
|
|
70
|
+
'# this project does not include' \
|
|
71
|
+
'a custom config step.' \
|
|
72
|
+
> cfgdefs.mk
|
|
73
|
+
cat $mb_project_dir/sofort/cfgdefs.in cfgdefs.mk
|
|
67
74
|
fi
|
|
68
75
|
|
|
69
76
|
# user build-time overrides
|
|
70
|
-
|
|
77
|
+
touch usrdefs.mk
|
|
71
|
-
touch usrdefs.mk
|
|
72
|
-
fi
|
|
73
78
|
|
|
74
79
|
# project
|
|
75
80
|
mb_nickname=$NICKNAME
|
sofort/cfgdefs.in
ADDED
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
# changes made to this file will be gone the next time
|
|
2
|
+
# you run ./configure.
|
|
3
|
+
|
|
4
|
+
for persistent post-configure, ad-hoc changes to the
|
|
5
|
+
build project, use usrdefs.mk instead.
|