Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 09:30:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow the 'unique host identity' to be overriden by MOZILLA_CONFIG_HOST_IDENT.

Browse Source 
Also make the clean target in config/mkdetect actually work.
This commit is contained in:
ramiro%netscape.com 1998-09-09 08:00:10 +00:00
parent a95987dd0b
commit e6757c9096
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/config.mk
View File

@ -356,8 +356,16 @@ endif
ifneq (,$(filter Linux,$(OS_ARCH)))
MOZILLA_DETECT = 1
MOZILLA_DETECT_DIR = $(DEPTH)/config/mkdetect
MOZILLA_DETECT_IDENT = $(shell $(topsrcdir)/config/mkdetect/detect_hostident.sh)
MOZILLA_DETECT_NAME = detect_$(MOZILLA_DETECT_IDENT)_gen.mk
# A uniq identifier that describes this host
ifdef MOZILLA_CONFIG_HOST_IDENT
MOZILLA_DETECT_UNIQ_IDENT = $(MOZILLA_CONFIG_HOST_IDENT)
else
MOZILLA_DETECT_UNIQ_IDENT = $(shell $(topsrcdir)/config/mkdetect/detect_hostident.sh)
endif
MOZILLA_DETECT_NAME = detect_$(MOZILLA_DETECT_UNIQ_IDENT)_gen.mk
MOZILLA_DETECT_GEN = $(MOZILLA_DETECT_DIR)/$(MOZILLA_DETECT_NAME)
endif

11
config/mkdetect/Makefile
View File

@ -19,7 +19,11 @@
DEPTH = ../..
# A uniq identifier that describes this host
DETECT_UNIQ_IDENT = $(shell $(DETECT_DIR)/detect_hostident.sh)
ifdef MOZILLA_CONFIG_HOST_IDENT
DETECT_UNIQ_IDENT = $(MOZILLA_CONFIG_HOST_IDENT)
else
DETECT_UNIQ_IDENT = $(shell $(DETECT_DIR)/detect_hostident.sh)
endif
# Where we live
DETECT_DIR = $(DEPTH)/config/mkdetect
@ -66,10 +70,7 @@ export: $(DETECT_NAME)
detect: $(DETECT_NAME)
realclean clobber clobber_all clean:
@rm -f $(DETECT_NAME)
@$(DETECT_X11) --cleanup
@$(DETECT_MOTIF) --cleanup
@$(DETECT_GLIBC) --cleanup
@rm -f $(DETECT_NAME) *_motif_$(DETECT_UNIQ_IDENT)* *_glibc_$(DETECT_UNIQ_IDENT)* *_x11_$(DETECT_UNIQ_IDENT)*
# This is needed for DETECT_MOTIF to work
X11_INCLUDE_FLAGS=$(shell $(DETECT_X11) -if)

11
config/mkdetect/Makefile.in
View File

@ -24,7 +24,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# A uniq identifier that describes this host
DETECT_UNIQ_IDENT = $(shell $(DETECT_DIR)/detect_hostident.sh)
ifdef MOZILLA_CONFIG_HOST_IDENT
DETECT_UNIQ_IDENT = $(MOZILLA_CONFIG_HOST_IDENT)
else
DETECT_UNIQ_IDENT = $(shell $(DETECT_DIR)/detect_hostident.sh)
endif
# Where we live
DETECT_DIR = $(topsrcdir)/config/mkdetect
@ -74,10 +78,7 @@ export: $(DETECT_NAME)
detect: $(DETECT_NAME)
realclean clobber clobber_all clean:
@rm -f $(DETECT_NAME)
@$(DETECT_X11) --cleanup
@$(DETECT_MOTIF) --cleanup
@$(DETECT_GLIBC) --cleanup
@rm -f $(DETECT_NAME) *_motif_$(DETECT_UNIQ_IDENT)* *_glibc_$(DETECT_UNIQ_IDENT)* *_x11_$(DETECT_UNIQ_IDENT)*
# This is needed for DETECT_MOTIF to work
X11_INCLUDE_FLAGS=$(shell $(DETECT_X11) -if)