From 49da6500ca2957bd70ae65acdef3f044a0fc86a9 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed, 16 Jan 2008 13:23:55 +0000
Subject: INTEGRATION: CWS ause085 (1.26.30); FILE MERGED 2007/12/12 09:40:24
 hjs 1.26.30.1: #i81694# fix .class copy rule to copy just one class and
 subclasses

---
 odk/util/odk_rules.pmk | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk
index ea32b91367c9..d4b2919b11c1 100644
--- a/odk/util/odk_rules.pmk
+++ b/odk/util/odk_rules.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: odk_rules.pmk,v $
 #
-#   $Revision: 1.26 $
+#   $Revision: 1.27 $
 #
-#   last change: $Author: hr $ $Date: 2007-07-31 13:58:22 $
+#   last change: $Author: ihi $ $Date: 2008-01-16 14:23:55 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -144,8 +144,11 @@ $(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX)
     $(GNUCOPY) $(DLLOUT)$/$(@:f) $@
 
 $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/%.class : $(CLASSDIR)$/com$/sun$/star$/lib$/loader$/%.class
-    @@-$(RM) $(@:db)*.class
-    $(COPY) $(<:db)*.class $(@:d)
+    @@-$(RM) $(@:db).class
+    $(COPY) $(<:db).class $(@:d)
+# deal with subclasses
+    @@-$(RM) $(@:db)$(EMQ)$$*.class
+    -$(COPY) $(<:db)$(EMQ)$$*.class $(@:d)
 
 $(DESTDIRIDL)$/% : $(IDLOUT)$/%
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
-- 
cgit