summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2006-07-18 13:41:06 +0000
committerRoman Kennke <roman@kennke.org>2006-07-18 13:41:06 +0000
commit06d4da36c94a6faf160f067485a4433962f51944 (patch)
tree3a7b7b99bc187a8982bac425b7062a85fdaea00a
parente5a66321dde080271f4c62e1cba2b4a5e34b6553 (diff)
downloadclasspath-06d4da36c94a6faf160f067485a4433962f51944.tar.gz
2006-07-18 Roman Kennke <kennke@aicas.com>
* lib/copy-vmresources.sh.in: Reverted. * gnu/java/awt/peer/x/fonts.properties: Moved to resource/ * resource/gnu/java/awt/peer/x/fonts.properties: New file.
-rw-r--r--ChangeLog6
-rw-r--r--lib/copy-vmresources.sh.in2
-rw-r--r--resource/gnu/java/awt/peer/x/fonts.properties (renamed from gnu/java/awt/peer/x/fonts.properties)0
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 37d3c0254..44bb48604 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-07-18 Roman Kennke <kennke@aicas.com>
+ * lib/copy-vmresources.sh.in: Reverted.
+ * gnu/java/awt/peer/x/fonts.properties: Moved to resource/
+ * resource/gnu/java/awt/peer/x/fonts.properties: New file.
+
+2006-07-18 Roman Kennke <kennke@aicas.com>
+
* lib/copy-vmresources.sh.in: Include properties from X peers.
2006-07-18 Raif S. Naffah <raif@swiftdsl.com.au>
diff --git a/lib/copy-vmresources.sh.in b/lib/copy-vmresources.sh.in
index e391aa0e8..dbda9de20 100644
--- a/lib/copy-vmresources.sh.in
+++ b/lib/copy-vmresources.sh.in
@@ -2,7 +2,7 @@
# @configure_input@
top_srcdir=@top_srcdir@
-vmdirs=`echo "@vm_classes@ ${top_srcdir}/gnu/java/awt/peer/x" | sed 's%:% %g'`
+vmdirs=`echo "@vm_classes@" | sed 's%:% %g'`
destMetaDir=`pwd`/META-INF
destResDir=`pwd`
diff --git a/gnu/java/awt/peer/x/fonts.properties b/resource/gnu/java/awt/peer/x/fonts.properties
index 2c8755ceb..2c8755ceb 100644
--- a/gnu/java/awt/peer/x/fonts.properties
+++ b/resource/gnu/java/awt/peer/x/fonts.properties