Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv8571
Modified Files:
Tag: OPENOFFICE_ORG680
rules
Log Message:
remove generated symlinks in clean; generate java-gcj-compat symlink during
build
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.23
retrieving revision 1.214.2.14.2.24
diff -u -d -r1.214.2.14.2.23 -r1.214.2.14.2.24
--- rules 16 Mar 2005 12:01:42 -0000 1.214.2.14.2.23
+++ rules 16 Mar 2005 18:13:51 -0000 1.214.2.14.2.24
@@ -149,6 +149,11 @@
rm -f debian/openintro_debian.xcf debian/openintro_debian.bmp \
offmgr/res/openintro_debian.bmp
+ # remove generated symlinks
+ rm -f debian/usr/bin/gcc
+ rm -f debian/usr/bin/g++
+ rm -f debian/usr/lib/java-gcj-compat
+
# uuencode binary files
# for f in fonts/opens___.ttf src/ooo_custom_images*.bz2 src/images*.zip;
do
cd ooo-build ;\
@@ -232,6 +237,9 @@
ln -sf /usr/bin/gcc-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gcc
ln -sf /usr/bin/g++-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/g++
endif
+ # ... and for java-gcj-compat
+ cd debian/usr/lib && \
+ ln -sf jvm/java-1.4.2-gcj-4.0-1.4.2.0 java-gcj-compat
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
