Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv12669
Modified Files:
rules
Log Message:
Correct problems introduced by new lang= switch
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- rules 27 Oct 2003 08:48:40 -0000 1.158
+++ rules 27 Oct 2003 09:23:38 -0000 1.159
@@ -73,6 +73,9 @@
CONFIGURE_FLAGS+=--with-lang=$(shell debian/local/openoffice-xlate-lang -r
$(BUILDLANG))
endif
+# Prefix where setup is built
+BUILDLANG_PREFIX:=$(shell debian/local/openoffice-xlate-lang -p $(BUILDLANG))
+
# This is where the upstream install rules will put their stuff.
DEBTREEDIR:=$(CURDIR)/debian/tmp
OPENOFFICEDIR:=/usr/lib/openoffice$(VER)
@@ -595,7 +598,7 @@
$(STAMP_DIR)/instsetoo: $(STAMP_DIR)/solver
dh_testdir
. $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/instsetoo && \
- $(BUILDCMD) $(BUILDFLAGS) --from instsetoo --
instsetext="$(BUILDLANG)" $(DMAKEFLAGS)
+ $(BUILDCMD) $(BUILDFLAGS) --from instsetoo --
instsetext="$(BUILDLANG_PREFIX)" $(DMAKEFLAGS)
touch $@
@@ -604,7 +607,7 @@
$(STAMP_DIR)/setupins: $(STAMP_DIR)/solver
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
dh_testdir
- # we don't want to build $(BUILDLANG) so remove it from the list
+ # we don't want to build $(BUILDLANG_PREFIX) so remove it from the list
. $(SOURCE_TREE)/$(ENVFILE); cd $(SOURCE_TREE)/instsetoo &&
LZIPFLAGS=-O \
instsetext="`cd util;dmake instsetext= | sed -n '/alllangext:/
s/alllangext:\(.*\) 01 \(.*\)/\1 \2/p'`" \
$(BUILDCMD) --from instsetoo $(BUILDFLAGS) -- $(DMAKEFLAGS)
@@ -646,13 +649,6 @@
$(STAMP_DIR)/maintscripts: debian/shell-lib.sh debian/control
dh_testdir
- # there is a problem that uno_writerdb.rdb does not exist, so setup
does not work.
- # This is a workaround
- #cp
$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/setup_services.rdb \
- #
$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/uno_writerdb.rdb
- #zip -j -5 "f0_061"
$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/uno_writerdb.rdb
- #mv f0_061.zip
$(SOURCE_TREE)/instsetoo/$(ARCHBUILDDIR)/$(BUILDLANG)/normal
-
# generate maintainer scripts from *.in
# or generate default script which calls hook in
openoffice.org-debian-files package
for PKG in `dh_listpackages`; do \
@@ -692,7 +688,7 @@
debian/local/rsfile.global.txt > debian/local/rsfile.txt
# Run OOo setup using response file.
- $(SOURCE_TREE)/instsetoo/$(ARCHBUILDDIR)/$(BUILDLANG)/normal/setup -v \
+
$(SOURCE_TREE)/instsetoo/$(ARCHBUILDDIR)/$(BUILDLANG_PREFIX)/normal/setup -v \
-R:$(CURDIR)/debian/local/rsfile.txt -nogui
rm -f debian/local/rsfile.txt
@@ -1026,7 +1022,7 @@
@echo '$$(DMAKEFLAGS)' is "$(DMAKEFLAGS)"
@echo '$$(SHLIBS_OVERRIDE)' is "$(SHLIBS_OVERRIDE)"
@echo '$$(BUILD_ALL_LANGPACKS)' is "$(BUILD_ALL_LANGPACKS)"
- @echo '$$(BUILDLANG)' is "$(BUILDLANG)"
+ @echo '$$(BUILDLANG),$$(BUILDLANG_PREFIX)' is
"$(BUILDLANG),$(BUILDLANG_PREFIX)"
@echo 'See debian/control for build dependencies.'
