diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-09 18:11:58 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-09 18:11:58 +0000 |
| commit | e8a42ae2991013f586cb0606fcbd70d9b4c41d6f (patch) | |
| tree | 1d5b06eb945dddd558fe01a7ae1de67b73fbfef0 /includes/ghc.mk | |
| parent | ebd230eb1c459d4d2fdff5d08830e5df37c7c9f9 (diff) | |
| download | haskell-e8a42ae2991013f586cb0606fcbd70d9b4c41d6f.tar.gz | |
Rejig the includes/ installation rules
They're a little nicer now, and a regression in the cygwin build is
fixed (the $i in the destination wasn't surviving being passed through
cygpath).
Diffstat (limited to 'includes/ghc.mk')
| -rw-r--r-- | includes/ghc.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index 1f7ea116e0..eeb52bac4f 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -18,9 +18,15 @@ includes_H_CONFIG = includes/ghcautoconf.h includes_H_PLATFORM = includes/ghcplatform.h # -# All header files +# All header files are in includes/{one of these subdirectories} # -includes_H_FILES = $(filter-out $(includes_H_CONFIG) $(includes_H_PLATFORM),$(wildcard includes/*.h includes/*/*.h includes/*/*/*.h)) +includes_H_SUBDIRS += . +includes_H_SUBDIRS += rts +includes_H_SUBDIRS += rts/prof +includes_H_SUBDIRS += rts/storage +includes_H_SUBDIRS += stg + +includes_H_FILES := $(wildcard $(patsubst %,includes/%/*.h,$(includes_H_SUBDIRS))) # # Options @@ -180,16 +186,14 @@ $(eval $(call all-target,includes,,\ $(includes_H_CONFIG) $(includes_H_PLATFORM) \ $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS))) -includes_subdirs = $(sort $(subst includes/,,$(foreach d,$(includes_H_FILES),$(dir $(d))))) - install: install_includes .PHONY: install_includes install_includes : $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)") - for d in $(includes_subdirs); do \ + for d in $(includes_H_SUBDIRS); do \ $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)/$$d"); \ + $(call INSTALL_HEADER,$(INSTALL_OPTS),includes/$$d/*.h,"$(DESTDIR)$(ghcheaderdir)/$$d/"); \ done - for i in $(subst includes/,,$(includes_H_FILES) $(includes_H_CONFIG) $(includes_H_PLATFORM)); do \ - $(call INSTALL_HEADER,$(INSTALL_OPTS),includes/$$i,"$(DESTDIR)$(ghcheaderdir)/$$i"); \ - done + $(call INSTALL_HEADER,$(INSTALL_OPTS),$(includes_H_CONFIG) $(includes_H_PLATFORM),"$(DESTDIR)$(ghcheaderdir)/") + |