Blob Blame Raw
--- crm114-20060704a-BlameRobert.src/megatest.sh.r	2006-07-08 04:48:12.000000000 +0200
+++ crm114-20060704a-BlameRobert.src/megatest.sh	2006-08-16 22:56:23.000000000 +0200
@@ -50,7 +50,7 @@
 crm skudtest.crm 
 crm statustest.crm 
 #./exectest.crm
-./unionintersecttest.crm 
+crm unionintersecttest.crm 
 crm beeptest.crm 
 crm userdirtest.crm 
 crm windowtest.crm  <<-EOF
--- crm114-20060704a-BlameRobert.src/Makefile.r	2006-07-08 04:48:12.000000000 +0200
+++ crm114-20060704a-BlameRobert.src/Makefile	2006-08-16 22:53:12.000000000 +0200
@@ -47,7 +47,7 @@
 #  Tell the compiler full optimization, allow debugging, and warn on every
 #  possible error
 #  
-CFLAGS += -O3 -g -Wall 
+#CFLAGS += -O3 -g -Wall 
 #     turn this one on for no optimization debugging.
 #CFLAGS += -O0 -g -Wall 
 #     turn this one on for really picayune debugging.
@@ -56,7 +56,7 @@
 #   Choose between static and dynamic linking (we recommend static linking)
 #   Comment this out if you want dynamic linking
 #
-LDFLAGS += -static
+#LDFLAGS += -static
 #
 #   Any standard install flags?  We nominally use protection 755
 INSTALLFLAGS += -m 755
@@ -314,13 +314,13 @@
 		crm_util_errorhandlers.o \
 		crm_osbf_maintenance.o -lm -ltre -o osbf-util
 
-cssdiff: cssdiff.c crm_util_errorhandlers.o $(HFILES)
+cssdiff: cssdiff.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
 	$(CC)  $(CFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' -c cssdiff.c -o cssdiff.o
 	$(CC)  $(CFLAGS) $(LDFLAGS) \
 		crm_util_errorhandlers.o \
 		crm_str_funcs.o -ltre cssdiff.o -o cssdiff
 
-cssmerge: cssmerge.c crm_util_errorhandlers.o $(HFILES)
+cssmerge: cssmerge.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
 	$(CC)  $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \
 		crm_str_funcs.o \
 		crm_util_errorhandlers.o \
@@ -354,29 +354,29 @@
 
 install_utils:
 	$(MAKE) cssmerge cssutil cssdiff osbf-util
-	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
-	install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
+	install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
 	#   if you don't have EMACS installed in the default place, you
 	#   won't get the crm114-mode.el automatically.
-	-install $(INSTALLFLAGS) crm114-mode.el /usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
 
 install_tre: crm114_tre
-	install $(INSTALLFLAGS) crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
+	install $(INSTALLFLAGS) crm114_tre $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
 
 # use different name so we can keep it around along with default one
 # and same VER_SUFFIX postfix 
 install_gnu: crm114_gnu
-	install $(INSTALLFLAGS) crm114_gnu $(BINDIR)/crmg$(VER_SUFFIX)
+	install $(INSTALLFLAGS) crm114_gnu $(DESTDIR)$(BINDIR)/crmg$(VER_SUFFIX)
 
 install_binary_only: FORCE
-	install $(INSTALLFLAGS) crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)	
-	install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
-	-install $(INSTALLFLAGS) crm114-mode.el /usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+	install $(INSTALLFLAGS) crm114_tre $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)	
+	install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
+	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
 
 uninstall: FORCE
 	-rm -rf $(BINDIR)/crm$(VER_SUFFIX)