diff -up crm114-20070810-BlameTheSegfault.src/Makefile.r crm114-20070810-BlameTheSegfault.src/Makefile
--- crm114-20070810-BlameTheSegfault.src/Makefile.r 2007-08-13 13:05:35.000000000 +0200
+++ crm114-20070810-BlameTheSegfault.src/Makefile 2007-10-27 15:49:38.000000000 +0200
@@ -54,7 +54,7 @@ SYSTEMTYPE = POSIX
# and warn on all warnable things "-Wall". Someday add -Wextra for
# really picayune stuff.
#
-CFLAGS += -g -O3 -Wall
+#CFLAGS += -g -O3 -Wall
# turn this one on for no optimization debugging.
#CFLAGS += -g -O0 -Wall
# turn this one on for really picayune debugging.
@@ -64,7 +64,7 @@ CFLAGS += -g -O3 -Wall
# Comment this out if you want dynamic linking
#
# BSD users - do NOT use -static-libgcc!!!
-LDFLAGS += -static -static-libgcc
+#LDFLAGS += -static -static-libgcc
#
# Any standard install flags? We nominally use protection 755
INSTALLFLAGS += -m 755
@@ -411,13 +411,13 @@ osbf-util: osbf-util.c crm_osbf_maintena
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 \
@@ -449,13 +449,13 @@ install_utils:
# Installing Utilities
#
$(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 $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+ -install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
# use different name so we can keep it around along with default one
@@ -464,15 +464,15 @@ install_engine: crm114
#
# Installing engine
#
- install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
+ install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
install_binary_only: FORCE
- install $(INSTALLFLAGS) crm114 $(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 $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+ install $(INSTALLFLAGS) crm114 $(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)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
uninstall: FORCE
-rm -rf $(BINDIR)/crm$(VER_SUFFIX)