------------------------------------------------------------
revno: 1177
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-07-17 01:32:44 +0200
message:
fix SDK install
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-07-16 23:32:03 +0000
+++ b/changelog 2008-07-16 23:32:44 +0000
@@ -2,7 +2,7 @@
* OpenOffice.org development milestone 25 (DEV300_m25)
* ooo-build:
- - update (r13256)
+ - update (r13257)
* debian/rules:
- Add SYSTEM_LUCENE conditional but don't enable it yet
(liblucene2-java is in contrib...)
=== modified file 'rules'
--- a/rules 2008-07-16 14:58:37 +0000
+++ b/rules 2008-07-16 23:32:44 +0000
@@ -2239,7 +2239,7 @@
$(PKGDIR)-dev/$(OODIR)/sdk/setsdkenv_unix.$$i; \
done
# create wrapper scripts
- cd $(PKGDIR)-dev/$(OODIR)/sdk/$(OS)/bin && \
+ cd $(PKGDIR)-dev/$(OODIR)/sdk/bin && \
for i in *; do \
if [ "$$i" = "regcomp" -o "$$i" = "regcomp.bin" ]; then \
continue; \
@@ -2249,7 +2249,7 @@
echo "#!/bin/sh"; \
echo "# wrapper script for OOos SDK programs"; \
echo ""; \
- echo 'LD_LIBRARY_PATH=/$(OODIR)/program
/$(OODIR)/sdk/$(OS)/bin/`basename $$0`.bin "$$@"'; \
+ echo 'LD_LIBRARY_PATH=/$(OODIR)/program
/$(OODIR)/sdk/bin/`basename $$0`.bin "$$@"'; \
) > $$i; \
chmod 755 $$i; \
done && \
@@ -2257,7 +2257,7 @@
echo "#!/bin/sh"; \
echo "# wrapper script for OOos SDK programs"; \
echo ""; \
- echo 'LD_LIBRARY_PATH=/$(OODIR)/program
/$(OODIR)/sdk/$(OS)/bin/`basename $$0`.bin "$$@"'; \
+ echo 'LD_LIBRARY_PATH=/$(OODIR)/program /$(OODIR)/sdk/bin/`basename
$$0`.bin "$$@"'; \
) > regcomp; \
chmod 755 regcomp
# remove symlink, it should be in -dev-doc
