------------------------------------------------------------
revno: 1469
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Sun 2009-03-29 20:10:53 +0200
message:
ooo-build has no "current" dir anymore....
modified:
rules
=== modified file 'rules'
--- a/rules 2009-03-27 19:34:59 +0000
+++ b/rules 2009-03-29 18:10:53 +0000
@@ -1549,11 +1549,7 @@
endif
# Make convenience link
-ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
- if [ ! -L build ]; then ln -s ooo-build/build/current build ; fi
-else
if [ ! -L build ]; then ln -s $(SOURCE_TREE) build ; fi
-endif
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
@@ -1585,10 +1581,6 @@
cd ooo-build ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) $(MAKE)
- if [ -d ooo-build/build/current -a ! -d $(SOURCE_TREE) ]; then \
- ln -sf current $(SOURCE_TREE); \
- fi
-
# apparently setting this here globally doesn't work, so hack around.
# If we don't do this we get loads of harmless, but log-bloating
# warnings
@@ -2627,7 +2619,7 @@
# fix links
cd $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/java/ref && \
for i in `find . -type f | xargs`; do \
- perl -pi -e
's,file:$(CURDIR)/ooo-build/build/(current|$(TAG))/odk/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/odkcommon/docs/common/ref/,,g'
$$i; \
+ perl -pi -e
's,file:$(CURDIR)/ooo-build/build/$(TAG)/odk/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/odkcommon/docs/common/ref/,,g' $$i; \
done
endif
endif
