|
 |
9f327dd |
diff -up crm114-20090807-BlameThorstenAndJenny.src/Makefile.r crm114-20090807-BlameThorstenAndJenny.src/Makefile
|
|
|
9f327dd |
--- crm114-20090807-BlameThorstenAndJenny.src/Makefile.r 2009-08-07 17:22:37.000000000 +0200
|
|
|
9f327dd |
+++ crm114-20090807-BlameThorstenAndJenny.src/Makefile 2009-08-23 17:31:00.000000000 +0200
|
|
|
9f327dd |
@@ -98,7 +98,7 @@ CFLAGS += -DVERSION='"$(VERSION)"'
|
|
|
8c8b2ea |
# really picayune stuff.
|
|
|
9f327dd |
#
|
|
|
4fa6490 |
# Our default is with debugging, full optimization, and lots of warnings:
|
|
|
9f327dd |
-CFLAGS += -O3 -Wall
|
|
|
9f327dd |
+CFLAGS += $(OPTFLAGS)
|
|
|
9f327dd |
# turn this one on for no optimization, but debugging
|
|
|
9f327dd |
#CFLAGS += -g -O0 -Wall
|
|
|
9f327dd |
#
|
|
|
9f327dd |
@@ -111,7 +111,7 @@ CFLAGS += -O3 -Wall
|
|
|
9f327dd |
# Comment this out if you want dynamic linking
|
|
|
9f327dd |
#
|
|
|
137fae3 |
# BSD users - do NOT use -static-libgcc!!!
|
|
|
9f327dd |
-LDFLAGS += -static -static-libgcc
|
|
|
9f327dd |
+#LDFLAGS += -static -static-libgcc
|
|
|
4fa6490 |
# use this one if you want program profiling.
|
|
|
9f327dd |
#LDFLAGS += -static -static-libgcc -pg
|
|
|
9f327dd |
#LDFLAGS += -pg
|
|
|
9f327dd |
@@ -350,13 +350,13 @@ install_utils:
|
|
|
8c8b2ea |
# Installing Utilities
|
|
|
9f327dd |
#
|
|
|
60dbba1 |
$(MAKE) cssmerge cssutil cssdiff osbf-util
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
60dbba1 |
# if you don't have EMACS installed in the default place, you
|
|
|
60dbba1 |
# won't get the crm114-mode.el automatically.
|
|
|
137fae3 |
- -install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
137fae3 |
+ -install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
60dbba1 |
|
|
|
60dbba1 |
|
|
|
60dbba1 |
# use different name so we can keep it around along with default one
|
|
|
9f327dd |
@@ -365,15 +365,15 @@ install_engine: crm114
|
|
|
8c8b2ea |
#
|
|
|
8c8b2ea |
# Installing engine
|
|
|
8c8b2ea |
#
|
|
|
137fae3 |
- install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
|
|
|
137fae3 |
+ install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
|
|
|
137fae3 |
|
|
|
60dbba1 |
install_binary_only: FORCE
|
|
|
137fae3 |
- install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
9f327dd |
- install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
137fae3 |
- -install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
137fae3 |
+ install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
9f327dd |
+ install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
137fae3 |
+ -install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
60dbba1 |
|
|
|
60dbba1 |
uninstall: FORCE
|
|
|
60dbba1 |
-rm -rf $(BINDIR)/crm$(VER_SUFFIX)
|