diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-12-14 17:26:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-12-14 17:27:47 +0100 |
| commit | 454b962207f974df2dd912ba226e6f49390b14a3 (patch) | |
| tree | 87ffd33c70659851739fc5370c7cf2b17c3197aa /officecfg | |
| parent | 079de829c819f0d910bb81cbf8a6ff961ecef054 (diff) | |
Work around GNU Make 3.81 problem.
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/officecfg/registry/Makefile b/officecfg/registry/Makefile index e44fbd4f264d..edb80b0c0131 100644 --- a/officecfg/registry/Makefile +++ b/officecfg/registry/Makefile @@ -48,10 +48,13 @@ $(if $(1),$(1)/$(if $(2),$(2)/))%.hxx: \ endef -$(eval $(call my_target)) -$(eval $(call my_target,Office)) +# Sort longer paths before their prefixes, as at least GNU Make 3.81 on Mac OS X +# appears to let % span sub-directories, so that the above rule would produce +# unexpected results; sorting this way seems to avoid the problem: $(eval $(call my_target,Office,DataAccess)) $(eval $(call my_target,Office,OOoImprovement)) $(eval $(call my_target,Office,UI)) +$(eval $(call my_target,Office)) $(eval $(call my_target,TypeDetection)) $(eval $(call my_target,ucb)) +$(eval $(call my_target)) |