[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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: