X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2FImakefile;h=c9194ddd3562211c1862497fbbc7d79968067e93;hb=341494d91c661a635ff01f4ca553f6a8eddeee7e;hp=2fab64dc829fc5bf0ba1652115753bbcccbb9ca0;hpb=83b6996daa2c5ae22fc2b69093814cb08314954a;p=oweals%2Fcde.git

diff --git a/cde/Imakefile b/cde/Imakefile
index 2fab64dc..c9194ddd 100644
--- a/cde/Imakefile
+++ b/cde/Imakefile
@@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/22 1999/01/18 10:38:29 samborn $
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 
-CDE_RELEASE = 2.1.20
+CDE_RELEASE = 2.2.0
 
 SUBDIRS = config util logs include lib programs databases admin
 DOCSUBDIRS = config doc
@@ -34,7 +34,7 @@ clean::
 	$(RM) -r $(BUILDINCDIR)
 	$(RM) -r $(BUILDLIBDIR)
 
-      WORLDOPTS = -k
+      WORLDOPTS = 
       MAKE_OPTS = -f xmakefile
 
 XCOMM 
@@ -55,11 +55,7 @@ Everything::
 	@echo ""
 	@date
 	@echo ""
-	cd $(IMAKESRC) && if [ -f Makefile ]; then \
-	    $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	else \
-	    $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	fi
+	MakeImakeDir()
 	-$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak
 	$(MAKE) $(MFLAGS) -f xmakefile.bak xmakefile
 	$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles
@@ -82,11 +78,7 @@ Everything.dev::
 	@echo ""
 	@date
 	@echo ""
-	cd $(IMAKESRC) && if [ -f Makefile ]; then \
-	    $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	else \
-	    $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	fi
+	MakeImakeDir()
 	-$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak
 	$(MAKE) $(MFLAGS) -f xmakefile.bak xmakefile
 	$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles
@@ -120,11 +112,7 @@ Everything.doc::
 	@echo ""
 	@date
 	@echo ""
-	cd $(IMAKESRC) && if [ -f Makefile ]; then \
-	    $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	else \
-	    $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	fi
+	MakeImakeDir()
 	-$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak
 	$(MAKE) $(MFLAGS) -f xmakefile.bak xmakefile
 	$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles.doc
@@ -139,7 +127,6 @@ Everything.doc::
 
 NamedTargetSubdirs(install.doc,$(DOCSUBDIRS),"installing",DESTDIR=$(DESTDIR),install)
 NamedTargetSubdirs(install.man.doc,$(DOCSUBDIRS),"installing man pages",DESTDIR=$(DESTDIR),install.man)
-InstallLinkKitSubdirs($(DOCSUBDIRS))
 NamedCleanSubdirs(clean.doc,$(DOCSUBDIRS))
 NamedTagSubdirs(tags.doc,$(DOCSUBDIRS))
 MakeMakeSubdirs($(DOCSUBDIRS),Makefiles.doc)