CVS:oo-deb/debian rules,1.165,1.166
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv27092
Modified Files:
rules
Log Message:
* Fix setupins target so it works again
* Add OpenSymbol font file dependency to install-indep target
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- rules 11 Nov 2003 14:16:43 -0000 1.165
+++ rules 12 Nov 2003 12:33:28 -0000 1.166
@@ -646,8 +646,9 @@
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
dh_testdir
# 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'`" \
+ . $(SOURCE_TREE)/$(ENVFILE).langpacks; cd $(SOURCE_TREE)/instsetoo && LZIPFLAGS=-O \
+ instsetext="`cd util;dmake instsetext= \
+ | sed -n '/alllangext:/ s/alllangext:\(.*\) $(BUILDLANG_PREFIX) \(.*\)/\1 \2/p'`" \
$(BUILDCMD) --from instsetoo $(BUILDFLAGS) -- $(DMAKEFLAGS)
touch $@
@@ -857,6 +858,7 @@
$(STAMP_DIR)/install-indep: debian/openoffice.org$(VER).install
$(STAMP_DIR)/install-indep: debian/openoffice.org$(VER)-mimelnk.install
$(STAMP_DIR)/install-indep: debian/openoffice.org$(VER).dirs
+$(STAMP_DIR)/install-indep: $(OOO_BUILD)/fonts/opens___.ttf
$(STAMP_DIR)/install-indep: $(STAMP_DIR)/manifest
dh_testdir
dh_testroot
Reply to: