renamed some macros to please doogie :P

[apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 37ee9f830d4a284e5b85970988159bb6d0354b87..3ecf4ba27d254a1d6d4a24d889bbb8c1f052b5aa 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -82,7 +82,7 @@ YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
 SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
 FAIL_H = $(BASE)/buildlib/fail.mak
 
-include $(wildcard $(BUILD)/environment.*mak)
+include $(BUILD)/environment.mak
 
 ifdef STATICLIBS
 LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak
@@ -140,9 +140,15 @@ $(INCLUDE)/%.h $(addprefix $(INCLUDE)/,$(addsuffix /%.h,$(HEADER_TARGETDIRS))) :
 # makedep program that can be called after compiling, that's illistrated
 # by the DEPFLAG case.
 # Compile rules are expected to call this macro after calling the compiler
+ifdef GCC3DEP
+DFILE = $(DEP)/$(basename $(@F)).d
+else
+DFILE = $(basename $(@F)).d
+endif
 ifdef INLINEDEPFLAG
  define DoDep
-       sed -e "1s/.*:/$(subst /,\\/,$@):/" $(basename $(@F)).d > $(DEP)/$(@F).d
+       sed -e "1s/.*:/$(subst /,\\/,$@):/" $(DFILE) > $(DEP)/$(@F).d
+       #sed -e "1s/.*:/$(subst /,\\/,$@):/" $(DEP)/$(basename $(@F)).d > $(DEP)/$(@F).d
        -rm -f $(basename $(@F)).d
  endef
 else