diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2005-03-04 13:56:48 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2005-03-04 13:56:48 +0000 |
| commit | 9ba214036ce3c06f7da6b4e0d006a82f52fae8e9 (patch) | |
| tree | ca7a1d1a052c25773b7276e3fef3fef8d6a476a0 /lib/make/make.configuration | |
| parent | 039096b54685433eba3daa5205d07cf3646cda6a (diff) | |
Patch from Yaakoub to fix some problems with configuration.ccl stuff
and reorganise directories.
Note the patch to CreateConfigurationBindings.pl is from 1.3 of that
file, and, hopefully, fixes the same problems that 1.4 did.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3997 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.configuration')
| -rw-r--r-- | lib/make/make.configuration | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index b115d6a4..5163fe47 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -96,7 +96,7 @@ endif # generated from a thorn's configuration.ccl ifeq ($(strip $(UTILS)),) ifneq ($(strip $(THORN_LINKLIST)),) --include $(THORN_LINKLIST:%=$(BINDINGS_DIR)/Configuration/%/make.configuration.defn) +-include $(THORN_LINKLIST:%=$(BINDINGS_DIR)/Configuration/Thorns/make.%.defn) endif endif @@ -232,7 +232,7 @@ $(TOP)/ThornList: # Allow each thorn to include some global dependencies ifneq ($(strip $(THORNS)),) --include $(THORNS:%=$(PACKAGE_DIR)/%/src/make.configuration.deps) $(THORNS:%=$(BINDINGS_DIR)/Configuration/%/make.configuration.deps) +-include $(THORNS:%=$(PACKAGE_DIR)/%/src/make.configuration.deps) $(THORNS:%=$(BINDINGS_DIR)/Configuration/Thorns/make.%.deps) endif # Catch the special case of a thorn being removed from the disk entirely. |