------------------------------------------------------------
revno: 819
committer: Chris Cheney <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Thu 2007-08-02 16:37:54 -0500
message:
indentation cleanups
check to verify GSI_he.sdf exists before using sed...
modified:
rules
=== modified file 'rules'
--- a/rules 2007-08-02 12:00:20 +0000
+++ b/rules 2007-08-02 21:37:54 +0000
@@ -301,7 +301,7 @@
endif
# We only build the main openoffice.org packages on those architectures where
it works
-# # all other architectures build libmythes-dev
+# all other architectures build libmythes-dev
ifneq "$(USE_EXTERNAL_MYTHES)" "y"
ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_ARCHS)))
BUILD_ONLY_LIBMYTHES=y
@@ -336,33 +336,33 @@
# -g gives a far too big deb (>400M, ca. 1GB I-S)
SMALL_SYMBOLS = y
DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64
!alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-dbg, libx11-6-dbg,
libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg,
libice6-dbg, libsm6-dbg, libxinerama1-dbg
-ifeq "$(USE_LIBCURL4)" "y"
+ ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
-else
+ else
DBG_DBG_SUGGESTS+= , libcurl4-dbg
-endif
+ endif
endif
ifeq "$(BUILD_PYUNO)" "y"
- ifeq "$(USE_PYCENTRAL)" "y"
- BUILD_DEPS += , python-central (>= 0.5) [$(OOO_ARCHS)], debhelper (>=
5.0.37.2)
- else
- BUILD_DEPS += , debhelper (>= 5)
- endif
- BUILD_DEPS += , python-dev (>= 2.4) [$(OOO_ARCHS)]
- WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
- DBG_DBG_SUGGESTS+= , python-dbg
+ ifeq "$(USE_PYCENTRAL)" "y"
+ BUILD_DEPS += , python-central (>= 0.5) [$(OOO_ARCHS)], debhelper (>=
5.0.37.2)
+ else
+ BUILD_DEPS += , debhelper (>= 5)
+ endif
+ BUILD_DEPS += , python-dev (>= 2.4) [$(OOO_ARCHS)]
+ WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
+ DBG_DBG_SUGGESTS+= , python-dbg
else
- BUILD_DEPS += , debhelper (>= 5)
- BUILD_DEPS += python [$(OOO_ARCHS)]
+ BUILD_DEPS += , debhelper (>= 5)
+ BUILD_DEPS += python [$(OOO_ARCHS)]
endif
ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(BUILD_JARS_NATIVE)" "y"
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
BUILD_DEPS += , dpkg-dev (>= 1.13.19)
STAMP_NATIVE_JARS = $(STAMP_DIR)/native-jars
JAVA_GCJ_DEPENDS = libgcj-common (>= 1:4.1.1-14)
- endif
+ endif
endif
ifneq "$(PACKAGE_QA_TOOLS)" "y"
@@ -416,11 +416,11 @@
ifeq "$(ENABLE_JAVA)" "y"
JAVA_HOME=/usr/lib/jvm/java-gcj
CONFIGURE_FLAGS += --enable-gcjaot
- ifeq "$(BUILD_JARS_NATIVE)" "y"
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.65-4) [$(OOO_JAVA_ARCHS)]
- else
+ else
BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.56) [$(OOO_JAVA_ARCHS)]
- endif
+ endif
BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_JAVA_ARCHS)]
GCJ_VERSION = $(shell $(JAVA_HOME)/bin/gcj --version | head -n 1 | awk
'{ print $$3; }' | cut -d"." -f1,2)
GCJ_DBTOOL = gcj-dbtool-$(GCJ_VERSION)
@@ -428,21 +428,21 @@
SYSTEM_XALAN=y
SYSTEM_XERCES=y
SYSTEM_XML_APIS=y
-ifeq "$(GCJ_VERSION)" "4.2"
+ ifeq "$(GCJ_VERSION)" "4.2"
LIBGCJ_SONR=8
-else
+ else
LIBGCJ_SONR=7
-endif
+ endif
DBG_DBG_SUGGESTS+= , libgcj$(LIBGCJ_SONR)-dbg
-ifeq "$(shell dpkg --compare-versions `dpkg -l gcj-4.1 | tail -n 1 | awk '{
print $$3 }'` ge '4.1.2-3' && echo true || echo false)" "true"
+ ifeq "$(shell dpkg --compare-versions `dpkg -l gcj-4.1 | tail -n 1 | awk '{
print $$3 }'` ge '4.1.2-3' && echo true || echo false)" "true"
JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
-else
- ifeq "$(GCJ_VERSION)" "4.2"
+ else
+ ifeq "$(GCJ_VERSION)" "4.2"
JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-0-awt
- else
+ else
JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-awt
+ endif
endif
-endif
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common (>> 2.2.0-4)
@@ -492,13 +492,13 @@
CONFIGURE_FLAGS+= --with-firefox
BUILD_DEPS+= , firefox-dev [$(OOO_ARCHS)]
else
- ifeq "$(USE_XULRUNNER)" "y"
+ ifeq "$(USE_XULRUNNER)" "y"
CONFIGURE_FLAGS+= --with-xulrunner
BUILD_DEPS+= , libxul-dev [$(OOO_ARCHS)], libnss3-dev [$(OOO_ARCHS)]
DBG_DBG_SUGGESTS+= , libnss3-0d-dbg, libnspr4-0d-dbg
- else
+ else
CONFIGURE_FLAGS += --disable-mozilla
- endif
+ endif
endif
ifeq "$(USE_SYSTEM_DMAKE)" "y"
@@ -506,20 +506,20 @@
endif
ifeq "$(ENABLE_MONO)" "y"
- # gmcs for gmcs itself and mkbundle2 and -mcs for mcs itself and al.
- BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs
$(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER)
[$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)],
cli-common-dev (>= 0.4.4) [$(OOO_MONO_ARCHS)]
- # http://pkg-mono.alioth.debian.org/cli-policy/ch-mono.html#s7.3
- MONO_SHARED_DIR = $(CURDIR)
- export MONO_SHARED_DIR
- CONFIGURE_FLAGS+= --enable-mono
- DBG_DBG_SUGGESTS += , libmono0-dbg [$(OOO_MONO_ARCHS)]
+ # gmcs for gmcs itself and mkbundle2 and -mcs for mcs itself and al.
+ BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs
$(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER)
[$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)],
cli-common-dev (>= 0.4.4) [$(OOO_MONO_ARCHS)]
+ # http://pkg-mono.alioth.debian.org/cli-policy/ch-mono.html#s7.3
+ MONO_SHARED_DIR = $(CURDIR)
+ export MONO_SHARED_DIR
+ CONFIGURE_FLAGS+= --enable-mono
+ DBG_DBG_SUGGESTS += , libmono0-dbg [$(OOO_MONO_ARCHS)]
else
- CONFIGURE_FLAGS+= --disable-mono
+ CONFIGURE_FLAGS+= --disable-mono
endif
ifeq "$(USE_SYSTEM_HUNSPELL)" "y"
- BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
[$(OOO_ARCHS)]
- CONFIGURE_FLAGS+= --with-system-hunspell
+ BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER) [$(OOO_ARCHS)]
+ CONFIGURE_FLAGS+= --with-system-hunspell
endif
ifeq "$(SYSTEM_ALTLINUXHYPH)" "y"
@@ -528,10 +528,10 @@
endif
ifeq "$(USE_AGG)" "y"
- CONFIGURE_FLAGS+= --with-agg
+ CONFIGURE_FLAGS+= --with-agg
ifeq "$(SYSTEM_AGG)" "y"
- BUILD_DEPS += , libagg-dev (>= 2.3-2) [$(OOO_ARCHS)]
- CONFIGURE_FLAGS += --with-system-agg
+ BUILD_DEPS += , libagg-dev (>= 2.3-2) [$(OOO_ARCHS)]
+ CONFIGURE_FLAGS += --with-system-agg
endif
endif
@@ -540,16 +540,16 @@
else
ifeq "$(USE_SYSTEM_STLPORT)" "y"
ifeq "$(USE_STLPORT5)" "y"
- LIBSTLPORT_MINVER= (>= 5.0.99rc2-5)
- BUILD_DEPS += , libstlport5.1-dev $(LIBSTLPORT_MINVER) [$(OOO_ARCHS)]
- DEV_STL_DEPENDS=, libstlport5.1-dev $(LIBSTLPORT_MINVER)
- DBG_DBG_SUGGESTS+= , libstlport5.1-dbg
+ LIBSTLPORT_MINVER= (>= 5.0.99rc2-5)
+ BUILD_DEPS += , libstlport5.1-dev $(LIBSTLPORT_MINVER) [$(OOO_ARCHS)]
+ DEV_STL_DEPENDS=, libstlport5.1-dev $(LIBSTLPORT_MINVER)
+ DBG_DBG_SUGGESTS+= , libstlport5.1-dbg
else
- LIBSTLPORT_MINVER= (>= 4.6.2-3)
- BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_ARCHS)]
- DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER)
+ LIBSTLPORT_MINVER= (>= 4.6.2-3)
+ BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_ARCHS)]
+ DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER)
endif
- CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
+ CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
endif
endif
@@ -564,34 +564,34 @@
endif
ifeq "$(USE_SYSTEM_PORTAUDIO)" "y"
-ifeq "$(USE_PORTAUDIO_V19)" "y"
+ ifeq "$(USE_PORTAUDIO_V19)" "y"
BUILD_DEPS += , portaudio19-dev [$(OOO_ARCHS)]
-else
+ else
BUILD_DEPS += , libportaudio-dev [$(OOO_ARCHS)]
-endif
+ endif
CONFIGURE_FLAGS += --with-system-portaudio
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
- BUILD_DEPS += , libwpd8-dev $(LIBWPD8_MINVER) [$(OOO_ARCHS)]
- CONFIGURE_FLAGS+= --with-system-libwpd
-ifeq "$(USE_SYSTEM_SABLOT)" "y"
+ BUILD_DEPS += , libwpd8-dev $(LIBWPD8_MINVER) [$(OOO_ARCHS)]
+ CONFIGURE_FLAGS+= --with-system-libwpd
+ ifeq "$(USE_SYSTEM_SABLOT)" "y"
BUILD_DEPS += , libsablot0-dev (>= 1.0.2-4) [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-sablot
-endif
-ifeq "$(USE_EXTERNAL_MYTHES)" "y"
+ endif
+ ifeq "$(USE_EXTERNAL_MYTHES)" "y"
BUILD_DEPS += , libmythes-dev (>= 1:1.0-3) [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-mythes
DEBHELPER_OPTIONS+= -Nlibmythes-dev
-endif
-ifeq "$(USE_SYSTEM_LIBWPS)" "y"
+ endif
+ ifeq "$(USE_SYSTEM_LIBWPS)" "y"
BUILD_DEPS += , libwps-dev [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-libwps
-endif
-ifeq "$(USE_SYSTEM_LIBWPG)" "y"
+ endif
+ ifeq "$(USE_SYSTEM_LIBWPG)" "y"
BUILD_DEPS += , libwpg-dev [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-libwpg
-endif
+ endif
endif
ifeq "$(USE_SYSTEM_LIBSVG)" "y"
@@ -623,34 +623,35 @@
ifeq "$(BUILD_CAIROCANVAS)" "y"
ifeq "$(USE_SYSTEM_CAIRO)" "y"
- BUILD_DEPS+= , libcairo2-dev [$(OOO_ARCHS)], libglitz-glx1-dev
[$(OOO_ARCHS)]
- CONFIGURE_FLAGS+= --with-system-cairo
+ BUILD_DEPS+= , libcairo2-dev [$(OOO_ARCHS)], libglitz-glx1-dev
[$(OOO_ARCHS)]
+ CONFIGURE_FLAGS+= --with-system-cairo
endif
else
- CONFIGURE_FLAGS+= --disable-cairo
+ CONFIGURE_FLAGS+= --disable-cairo
endif
ifeq "$(BUILD_KDE)" "n"
CONFIGURE_FLAGS+= --disable-kde
DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-kde
- ifeq "$(DIST)" "Ubuntu"
- CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast
tango human"
- else
- CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast
tango"
- endif
+ ifeq "$(DIST)" "Ubuntu"
+ CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
human"
+ else
+ CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango"
+ endif
else
- BUILD_DEPS += , kdelibs4-dev $(KDELIBS_MINVER) [$(OOO_ARCHS)]
- DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
+ BUILD_DEPS += , kdelibs4-dev $(KDELIBS_MINVER) [$(OOO_ARCHS)]
+ DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
endif
ifeq "$(BUILD_BINFILTERS)" "y"
- CONFIGURE_FLAGS+= --enable-binfilter
- OOO_BINFILTER_DEP = openoffice.org$(VER)-filter-binfilter
+ CONFIGURE_FLAGS+= --enable-binfilter
+ OOO_BINFILTER_DEP = openoffice.org$(VER)-filter-binfilter
else
- DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-filter-binfilter
+ DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-filter-binfilter
endif
+
ifneq "$(BUILD_PYUNO)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno
+ DEBHELPER_OPTIONS+= -Npython-uno
endif
ifeq "$(ENABLE_JAVA)" "y"
@@ -662,7 +663,6 @@
JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
endif
endif
-
ifeq "$(USE_SYSTEM_BSH)" "y"
BUILD_DEPS += , bsh (>= 2.0b4-1) [$(OOO_JAVA_ARCHS)]
COMMON_BSH_DEPENDS = bsh (>= 2.0b4-1)
@@ -674,20 +674,20 @@
endif
ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
-ifeq "$(USE_SHARED_LPSOLVE)" "y"
+ ifeq "$(USE_SHARED_LPSOLVE)" "y"
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)],
lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)]
LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION)
-else
+ else
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)]
-endif
+ endif
CONFIGURE_FLAGS += --with-system-lpsolve
-ifeq "$(USE_LIBSUITESPARSE)" "y"
+ ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
BUILD_DEPS += , libsuitesparse-dev [$(OOO_ARCHS)]
-else
+ else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
BUILD_DEPS += , libufsparse-dev [$(OOO_ARCHS)]
-endif
+ endif
endif
ifeq "$(USE_DBUS)" "y"
@@ -705,9 +705,9 @@
endif
ifeq "$(USE_SYSTEM_NEON)" "y"
- BUILD_DEPS += , libneon26-dev [$(OOO_ARCHS)]
- DBG_DBG_SUGGESTS+= , libneon26-dbg
- CONFIGURE_FLAGS += --with-system-neon
+ BUILD_DEPS += , libneon26-dev [$(OOO_ARCHS)]
+ DBG_DBG_SUGGESTS+= , libneon26-dbg
+ CONFIGURE_FLAGS += --with-system-neon
endif
# CairoFonts patchset is applied for sid and this patch needs Gtk 2.10
@@ -715,22 +715,22 @@
BUILD_DEPS += , libgtk2.0-dev [$(OOO_ARCHS)]
else
BUILD_DEPS += , libgtk2.0-dev (>= 2.10) [$(OOO_ARCHS)]
-# cairo canvas might be disabled, but the patch needs cairo headers
-ifneq "$(BUILD_CAIROCANVAS)" "y"
+ # cairo canvas might be disabled, but the patch needs cairo headers
+ ifneq "$(BUILD_CAIROCANVAS)" "y"
BUILD_DEPS += , libcairo2-dev [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-cairo
-endif
+ endif
endif
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster
rebuild times
# A complete build uses about 200Mb of compiler cache.
ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
- CONFIGURE_FLAGS += --with-gcc-speedup=ccache
+ CONFIGURE_FLAGS += --with-gcc-speedup=ccache
endif
# Small symbols?
ifeq "$(SMALL_SYMBOLS)" "y"
- CONFIGURE_FLAGS += --enable-symbols=SMALL
+ CONFIGURE_FLAGS += --enable-symbols=SMALL
endif
# Restart build from a particular project?
@@ -742,11 +742,11 @@
# DEB_BUILD_OPTIONS=num-cpus=<n>
NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^\(.*,\)\?num-cpus=\([0-9]\+\).*$$/\2/p')
ifneq "$(NUM_CPUS)" ""
- CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
+ CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
else ifeq "$(DIST)" "Ubuntu"
- AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+ AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifneq ($(AVAIL_CPUS),1)
- CONFIGURE_FLAGS += --with-num-cpus=$(shell expr $(AVAIL_CPUS) + 1)
+ CONFIGURE_FLAGS += --with-num-cpus=$(shell expr $(AVAIL_CPUS) + 1)
endif
endif
@@ -761,12 +761,12 @@
ifeq ($(GCC_VERSION),)
BUILD_PATH = /usr/lib/jvm/java-gcj/bin:$$PATH
else
-ifeq ($(GCC_VERSION),snapshot)
+ ifeq ($(GCC_VERSION),snapshot)
BUILD_PATH = /usr/lib/jvm/java-gcj/bin:/usr/lib/gcc-snapshot/bin:$$PATH
BUILD_LD_LIBRARY_PATH = /usr/lib/gcc-snapshot/lib:$$LD_LIBRARY_PATH
-else
+ else
BUILD_PATH = /usr/lib/jvm/java-gcj/bin:$(CURDIR)/debian/usr/bin:$$PATH
-endif
+ endif
endif
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
@@ -1130,10 +1130,10 @@
debian/control
endif
ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(BUILD_JARS_NATIVE)" "y"
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.gcj.in
- endif
+ endif
endif
ifeq "$(ENABLE_MONO)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
@@ -1231,7 +1231,7 @@
done
ifneq ($(GCC_VERSION),)
-ifneq ($(GCC_VERSION),snapshot)
+ ifneq ($(GCC_VERSION),snapshot)
# create links for gcc and g++ (and gij and gcj), ooo-build does not
# honour overriding CC and CXX and we need to use gcc/g++ 4.0 or /
# ant.mk wants gcj at the moment...
@@ -1240,15 +1240,15 @@
ln -sf /usr/bin/$(CC_PREFIX)g++-$(GCC_VERSION)
$(CURDIR)/debian/usr/bin/g++
#ln -sf /usr/bin/$(CC_PREFIX)gcj-$(GCC_VERSION)
$(CURDIR)/debian/usr/bin/gcj
#ln -sf /usr/bin/gij-$(GCC_VERSION) $(CURDIR)/debian/usr/bin/gij
-else
-ifneq "$(CC_PREFIX)" ""
+ else
+ ifneq "$(CC_PREFIX)" ""
mkdir -p $(CURDIR)/debian/usr/bin
ln -s /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcc
$(CURDIR)/debian/usr/bin/gcc
ln -s /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)g++
$(CURDIR)/debian/usr/bin/g++
ln -s /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcj
$(CURDIR)/debian/usr/bin/gcj
ln -s /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gij
$(CURDIR)/debian/usr/bin/gij
-endif
-endif
+ endif
+ endif
endif
ifeq "$(USE_SYSTEM_STLPORT)" "y"
@@ -1261,7 +1261,7 @@
endif
ifneq "$(BUILD_ONLY_EN_US)" "y"
-ifneq "$(LANGPACKISOS)" "en-US"
+ ifneq "$(LANGPACKISOS)" "en-US"
# extract extra GSIs
find ooo-build/src -name "*.sdf.bz2" -exec bunzip2 -k \{\} \;
for i in `find ooo-build/src/*.sdf.gz`; do gunzip -dc "$$i" > \
@@ -1274,13 +1274,15 @@
grep -v OOO_LICENSE ooo-build/src/GSI_$$iso.sdf \
> $$TMP && mv $$TMP ooo-build/src/GSI_$$iso.sdf; \
done
-ifeq (he,$(findstring he,$(LANGPACKISOS)))
+ ifeq (he,$(findstring he,$(LANGPACKISOS)))
# TKOS_BUILD_DATE is bogus, too
- TMP=`mktemp -q`; \
- sed -e "s/TKOS_BUILD_DATE//g" < ooo-build/src/GSI_he.sdf \
- > $$TMP && mv $$TMP ooo-build/src/GSI_he.sdf
-endif
-endif
+ if [ -f ooo-build/src/GSI_he.sdf ]; then \
+ TMP=`mktemp -q`; \
+ sed -e "s/TKOS_BUILD_DATE//g" < ooo-build/src/GSI_he.sdf \
+ > $$TMP && mv $$TMP ooo-build/src/GSI_he.sdf ; \
+ fi
+ endif
+ endif
endif
# Make convenience link
@@ -1533,7 +1535,7 @@
# to do that with en-US anyway...
rm -rf $(PKGDIR)-help-en-us $(PKGDIR)-help-en-us.*.debhelper; \
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-help-en-us
$(PKGDIR)-help-en-us || exit 1
-ifneq "$(HELPISOS)" "en-US"
+ ifneq "$(HELPISOS)" "en-US"
set -e; \
for iso in $(filter-out en-US,$(HELPISOS)); do \
pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
@@ -1541,12 +1543,12 @@
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-help-$$iso \
$(PKGDIR)-help-$$pkgiso; \
done
-ifeq (hi-IN,$(findstring hi-IN,$(HELPISOS)))
+ ifeq (hi-IN,$(findstring hi-IN,$(HELPISOS)))
for i in $(PKGDIR)-help-hi-in/$(OODIR)/help/hi-IN/*.css; do \
perl -pi -e 's|(font-family: )(.*)|\1 \"Lohit Hindi\", \2|' $$i; \
done
-endif
-endif
+ endif
+ endif
endif
touch $@
@@ -1791,11 +1793,11 @@
mv $(PKGDIR)-core/$(OODIR)/program/$$f
$(PKGDIR)-qa-tools/$(OODIR)/program; \
done
-ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
mkdir -p -m755 $(PKGDIR)-qa-tools/usr/share/java/openoffice$(VER)
cp $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/class/OOoRunnerLight.jar \
$(PKGDIR)-qa-tools/usr/share/java/openoffice$(VER)
-endif
+ endif
mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/smoketest
install -m755 $(SOURCE_TREE)/smoketestoo_native/smoketest.pl \
@@ -1920,17 +1922,17 @@
endif
ifeq "$(PACKAGE_SDK)" "y"
-ifeq "$(USE_SYSTEM_STLPORT)" "y"
+ ifeq "$(USE_SYSTEM_STLPORT)" "y"
# when we use external stlport, we just can and should do a symlink
# for the SDK includes
cd $(PKGDIR)-dev/usr/include/openoffice$(VER) && \
rm -rf stl && ln -s /usr/include/stlport stl
-ifeq "$(USE_STLPORT5)" "y"
+ ifeq "$(USE_STLPORT5)" "y"
perl -pi -e "s/STORELIB=-lstore/STORELIB=-lstore\nSTLPORT_VER=500/" \
$(PKGDIR)-dev/$(OODIR)/sdk/settings/settings.mk
-endif
-endif
-ifeq "$(ENABLE_JAVA)" "y"
+ endif
+ endif
+ ifeq "$(ENABLE_JAVA)" "y"
# move SDK Java stuff into /usr/share/java/openoffice
rm -f $(PKGDIR)-dev/$(OODIR)/sdk/classes
mkdir -p $(PKGDIR)-dev/usr/share/java/openoffice$(VER)/win
@@ -1946,7 +1948,7 @@
ln -s `echo $$i | sed -e 's,$(CURDIR)/$(PKGDIR)-dev,,'`
`basename $$i`; \
done
rm -rf $(PKGDIR)-dev/usr/share/openoffice/sdk
-endif
+ endif
chmod 644 $(PKGDIR)-dev/$(OODIR)/sdk/configure.pl
for i in csh csh.in; do \
perl -pi -e 's,/usr/bin/csh,/bin/csh,'\
@@ -2044,7 +2046,7 @@
endif
ifeq "$(PACKAGE_SDK)" "y"
-ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
# install the UNO Java sources for e.g. eclipse
mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java/openoffice$(VER)
cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh; echo
$$UPD)/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin && \
@@ -2052,7 +2054,7 @@
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java/openoffice; \
done
-endif
+ endif
endif
ifeq "$(ENABLE_JAVA)" "y"
@@ -2249,14 +2251,13 @@
find $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs -name
'*.html' \
| xargs sed -ri
's,href="[^"]*DevelopersGuide/([^"]*\.(xhtml|pdf)[^"]*")(.*),href="http://api.openoffice.org/docs/DevelopersGuide/\1\3,g'
- ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
# 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; \
done
- endif
-
+ endif
endif
ifeq "$(ENABLE_JAVA)" "y"
@@ -2350,22 +2351,22 @@
ifeq "$(ENABLE_JAVA)" "y"
# symlink jars we use externally
-ifeq "$(SYSTEM_XALAN)" "y"
+ ifeq "$(SYSTEM_XALAN)" "y"
ln -sf /usr/share/java/xalan2.jar \
$(PKGDIR)-java-common/$(OODIR)/program/classes/xalan.jar
-endif
-ifeq "$(SYSTEM_XML_APIS)" "y"
+ endif
+ ifeq "$(SYSTEM_XML_APIS)" "y"
ln -sf /usr/share/java/xml-apis.jar \
$(PKGDIR)-java-common/$(OODIR)/program/classes/xml-apis.jar
-endif
-ifeq "$(SYSTEM_XERCES)" "y"
+ endif
+ ifeq "$(SYSTEM_XERCES)" "y"
ln -sf /usr/share/java/xercesImpl.jar \
$(PKGDIR)-java-common/$(OODIR)/program/classes/xercesImpl.jar
-endif
-ifeq "$(USE_SYSTEM_BSH)" "y"
+ endif
+ ifeq "$(USE_SYSTEM_BSH)" "y"
ln -sf /usr/share/java/bsh.jar \
$(PKGDIR)-java-common/$(OODIR)/program/classes/bsh.jar
-endif
+ endif
endif
# remove extra license files
rm -rf $(PKGDIR)-commmon/$(OODIR)/licenses
@@ -2445,27 +2446,27 @@
cp debian/catalog.xml
$(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd/officedocument/1_0
ifeq "$(PACKAGE_QA_TOOLS)" "y"
-ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
mkdir -p -m755 $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests/java
for d in objdsc testdocs; do \
cp -r $(SOURCE_TREE)/qadevOOo/$$d
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$d; \
done
-endif
+ endif
mkdir -p -m755 $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests
cp -r $(SOURCE_TREE)/qadevOOo/tests/basic
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests
-ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
for d in mod ifc; do \
cp -r $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/class/$$d
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests/java; \
done
-endif
+ endif
find $(PKGDIR)-qa-api-tests -type d -name "CVS" | xargs rm -rf
find $(PKGDIR)-qa-api-tests -type f | xargs chmod 0644
-ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
echo "TestBase=java_fat" >
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props
-endif
+ endif
echo "TestBase=java_complex" >
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/complex.props
echo "TestBase=basic_fat" >
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/basic.props
@@ -2474,7 +2475,7 @@
echo "BASICRESPTH=/$(OODIR)/qadevOOo/tests/basic" >> \
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/basic.props
-ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
echo "DescriptionPath=/$(OODIR)/qadevOOo/objdsc" >> \
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props; \
echo "TestDocumentPath=/$(OODIR)/qadevOOo/testdocs" >> \
@@ -2482,7 +2483,7 @@
echo "AppExecutionCommand=/$(OODIR)/program/soffice" \
"-norestore -nocrashreport
-accept=socket,host=localhost,port=8100;urp;" >> \
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props
-endif
+ endif
for i in complex basic; do \
echo "DescriptionPath=/$(OODIR)/qadevOOo/objdsc" >> \
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$i.props; \
@@ -2667,10 +2668,10 @@
done
UDK_CPP_FILES=`find
$(CURDIR)/debian/openoffice.org-dev-doc/usr/share/doc/openoffice.org-dev/docs/cpp/ref
| sed -e 's,$(CURDIR)/debian/openoffice.org-dev-doc,,g' | xargs`; \
echo "Files: $$UDK_CPP_FILES" >>
debian/openoffice.org-dev-doc.doc-base.udk-cpp-ref
- ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
UDK_JAVA_FILES=`find
$(CURDIR)/debian/openoffice.org-dev-doc/usr/share/doc/openoffice.org-dev/docs/java/ref
| sed -e 's,$(CURDIR)/debian/openoffice.org-dev-doc,,g' | xargs`; \
echo "Files: $$UDK_JAVA_FILES" >>
debian/openoffice.org-dev-doc.doc-base.udk-java-ref
- endif
+ endif
# xargs strips the many files here so we need to post-process it.
UDK_COMMON_FILES=`find
$(CURDIR)/debian/openoffice.org-dev-doc/usr/share/doc/openoffice.org-dev/docs/common/ref
| sed -e 's,$(CURDIR)/debian/openoffice.org-dev-doc,,g' | xargs`; \
TMP=`mktemp -q`; \
