CVS:oo-deb/debian rules,1.214.2.14.2.8,1.214.2.14.2.9
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6208
Modified Files:
Tag: OPENOFFICE_ORG680
rules
Log Message:
Move invocation of ooo-build distclean, and test for Makefile existence first
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.8
retrieving revision 1.214.2.14.2.9
diff -u -d -r1.214.2.14.2.8 -r1.214.2.14.2.9
--- rules 17 Jan 2005 15:17:37 -0000 1.214.2.14.2.8
+++ rules 17 Jan 2005 17:52:44 -0000 1.214.2.14.2.9
@@ -113,6 +113,10 @@
clean:
dh_testdir
+ if [ -r ooo-build/Makefile ]; then \
+ $(MAKE) -C ooo-build distclean ;\
+ fi
+
# we do not need them and they make problem with dpkg-source....
rm -f ooo-build/desktop/*.png ooo-build/www/*.png \
ooo-build/www/images/*.png ooo-build/templates/*.s* \
@@ -146,7 +150,6 @@
# Files created in debian directory
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
- -$(MAKE) -C ooo-build distclean
$(MAKE) -f debian/rules control
Reply to:
- Prev by Date:
Bug#290902: openoffice.org: Starts on wrong X display if the same user is logged in on another X display on the same machine.
- Next by Date:
CVS:dmake-deb README.Debian,1.1.1.1,1.2 changelog,1.7,1.8 control,1.4,1.5
- Previous by thread:
Bug#290902: openoffice.org: Starts on wrong X display if the same user is logged in on another X display on the same machine.
- Next by thread:
CVS:dmake-deb README.Debian,1.1.1.1,1.2 changelog,1.7,1.8 control,1.4,1.5
- Index(es):