[Libreoffice-commits] .: officecfg/registry

[Stephan Bergmann]

 officecfg/registry/Makefile |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 454b962207f974df2dd912ba226e6f49390b14a3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 14 17:26:21 2011 +0100

    Work around GNU Make 3.81 problem.

diff --git a/officecfg/registry/Makefile b/officecfg/registry/Makefile
index e44fbd4..edb80b0 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))