[Uml-devel] Patch for suse8 build

Peeter Russak pezz at tkwcy.ee
Sun May 5 15:32:04 UTC 2002


Hi,

automake of suse8 doesn't like that there's two EXTRA_DIST lines in
Makefile.am. Everything else compiles fine. Following patch fixes
EXTRA_DIST error and creates new file Makefile.cvs that is found in
all standard kde packages and takes care of creating configure and
friends. Please apply someone as I don't have cvs account.

-- 
Peeter

diff -urN uml-vanilla/Makefile.am uml-current/Makefile.am
--- uml-vanilla/Makefile.am	Thu May  2 12:06:09 2002
+++ uml-current/Makefile.am	Mon May  6 01:13:17 2002
@@ -2,7 +2,7 @@
 
 SUBDIRS = uml po doc 
 
-EXTRA_DIST = uml.kdevprj AUTHORS COPYING ChangeLog INSTALL README TODO uml.lsm 
+EXTRA_DIST = uml.kdevprj AUTHORS COPYING ChangeLog INSTALL README TODO uml.lsm admin
 
 ####### kdevelop will overwrite this part!!! (end)############
 # not a GNU package. You can remove this line, if 
@@ -24,8 +24,6 @@
 	$(MAKE) -f admin/Makefile.common package-messages
 	$(MAKE) -C po merge
 
-EXTRA_DIST = admin 
-
 dist-hook:
 	cd $(top_distdir) && perl admin/am_edit -padmin
 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
diff -urN uml-vanilla/Makefile.cvs uml-current/Makefile.cvs
--- uml-vanilla/Makefile.cvs	Thu Jan  1 03:00:00 1970
+++ uml-current/Makefile.cvs	Mon May  6 01:13:06 2002
@@ -0,0 +1,14 @@
+
+all:
+	@echo "This Makefile is only for the CVS repository"
+	@echo ""
+	@if test ! -d admin; then \
+	   echo "Please recheckout this module!" ;\
+	   echo "for cvs: use checkout once and after that update again" ;\
+	   echo "for cvsup: checkout kde-common from cvsup and" ;\
+	   echo "   link kde-common/admin to ./admin" ;\
+	   exit 1 ;\
+	fi
+	$(MAKE) -f admin/Makefile.common cvs
+
+.SILENT:





More information about the umbrello-devel mailing list