X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/83791534b7e41e3951ebbf6c5f70d44ff22afd84..f111b4b2d7c5047a0c87281418a5283b0649987c:/util/imake.includes/Imake.rules

diff --git a/util/imake.includes/Imake.rules b/util/imake.includes/Imake.rules
index 7aff9fc1..d54f4a3d 100644
--- a/util/imake.includes/Imake.rules
+++ b/util/imake.includes/Imake.rules
@@ -77,10 +77,10 @@ clean:: 								@@\
 	$(RM) profiled/?*.o						@@\
 									@@\
 install:: 								@@\
-	$(INSTALLRAW) -m 644 concat3(lib,libname,.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)	@@\
+	$(INSTALLRAW) -c -m 644 concat3(lib,libname,.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)	@@\
 	$(RANLIB) -t concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)	@@\
 	$(CHMOD) 444 concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)	@@\
-	$(INSTALLRAW) -m 644 concat3(lib,libname,_p.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,_p.a)	@@\
+	$(INSTALLRAW) -c -m 644 concat3(lib,libname,_p.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,_p.a)	@@\
 	$(RANLIB) -t concat4($(DESTDIR)$(LIBDIR)/,lib,libname,_p.a)	@@\
 	$(CHMOD) 444 concat4($(DESTDIR)$(LIBDIR)/,lib,libname,_p.a)	@@\
 	$(INSTALLFILE) concat3(llib-l,libname,.ln) concat4($(DESTDIR)$(LINTLIBDIR)/,llib-l,libname,.ln)	@@\
@@ -128,10 +128,10 @@ clean:: 								@@\
 	$(RM) objs							@@\
 									@@\
 install:: 								@@\
-	$(INSTALLRAW) -m 644 concat3(lib,libname,.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)	@@\
+	$(INSTALLRAW) -c -m 644 concat3(lib,libname,.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)	@@\
 	$(RANLIB) -t concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)	@@\
 	$(CHMOD) 444 concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)	@@\
-	$(INSTALLFILE) concat3(llib-l,libname,.ln) concat4($(DESTDIR)$(LINTLIBBDIR)/,llib-l,libname,.ln)	@@\
+	$(INSTALLFILE) concat3(llib-l,libname,.ln) concat4($(DESTDIR)$(LINTLIBDIR)/,llib-l,libname,.ln)	@@\
 
 #endif /* PROFILED_LIBS */
 
@@ -211,6 +211,12 @@ clean::									@@\
 									@@\
 depend:: concat(src,.h)
 
+#define mk_cmds(tbl)							@@\
+concat(tbl,.o): concat(tbl,.ct)						@@\
+	$(MAKE_COMMANDS) concat(tbl,.ct)				@@\
+clean::									@@\
+	$(RM) concat(src,.o)
+
 /*
  * Rule for building some random object module
  */
@@ -329,7 +335,7 @@ pgm: objs localdeps							@@\
 	$(CC) $(CFLAGS) -o $@ objs syslibs				@@\
 									@@\
 install::								@@\
-	if [ ! -f concat5(${DESTDIR},installdir,/,pgm,.ucb) -a -f concat4(${DESTDIR},installdir,/,pgm) ]; then \ @@\
+	-if [ ! -f concat5(${DESTDIR},installdir,/,pgm,.ucb) -a -f concat4(${DESTDIR},installdir,/,pgm) ]; then \ @@\
 		mv concat4(${DESTDIR},installdir,/,pgm) concat5(${DESTDIR},installdir,/,pgm,.ucb); fi; exit 0 @@\
 	$(INSTALLSUID) pgm concat4(${DESTDIR},installdir,/,pgm)		@@\
 									@@\