CVS:oo-deb/debian rules,1.253.2.3,1.253.2.4
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv14644
Modified Files:
Tag: OPENOFFICE_ORG_1_1_4
rules
Log Message:
merge forgotten debian/rules piece
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.253.2.3
retrieving revision 1.253.2.4
diff -u -d -r1.253.2.3 -r1.253.2.4
--- rules 20 Feb 2005 22:45:52 -0000 1.253.2.3
+++ rules 25 Feb 2005 07:57:36 -0000 1.253.2.4
@@ -122,14 +122,15 @@
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
BUILD_ALL_LANGPACKS=n
BUILDLANG:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p')
- ifeq "$(DIST)" "Debian"
- # the buildds do binary-only builds; thefore we only need to build en
- # (thanks James Troup for the username info)
- ifeq (buildd,$(shell whoami))
- BUILD_ALL_LANGPACKS=n
- BUILDLANG:=en
- endif
+else
+ ifeq "$(DIST)" "Debian"
+ # the buildds do binary-only builds; thefore we only need to build en
+ # (thanks James Troup for the username info)
+ ifeq (buildd,$(shell whoami))
+ BUILD_ALL_LANGPACKS=n
+ BUILDLANG:=en
endif
+ endif
endif
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
Reply to:
- Prev by Date:
CVS:oo-deb/debian changelog,1.417.2.11,1.417.2.12 control,1.197.2.4,1.197.2.5 control.in,1.164.2.4,1.164.2.5
- Next by Date:
CVS:oo-deb/debian changelog,1.428.2.1,1.428.2.2
- Previous by thread:
CVS:oo-deb/debian changelog,1.417.2.11,1.417.2.12 control,1.197.2.4,1.197.2.5 control.in,1.164.2.4,1.164.2.5
- Next by thread:
CVS:oo-deb/debian changelog,1.428.2.1,1.428.2.2
- Index(es):