diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2001-12-13 02:53:57 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2001-12-13 02:53:57 +0000 |
| commit | ca237d85f5fd2e10d8d0f3bf77cea8dca4c50f15 (patch) | |
| tree | 5a08746c1f72214517bca55b2940e710ad25782f /misc/sword15/files | |
| parent | Use mail/mew2 (for emacs21, repocopied from mai/mew2-emacs20) as master (diff) | |
upgrade to 1.5.2
PR: 32751
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=51426
Diffstat (limited to 'misc/sword15/files')
| -rw-r--r-- | misc/sword15/files/patch-Makefile.cfg | 90 |
1 files changed, 24 insertions, 66 deletions
diff --git a/misc/sword15/files/patch-Makefile.cfg b/misc/sword15/files/patch-Makefile.cfg index 7ad98e0abea1..ecbc3dbfe099 100644 --- a/misc/sword15/files/patch-Makefile.cfg +++ b/misc/sword15/files/patch-Makefile.cfg @@ -1,80 +1,38 @@ ---- Makefile.cfg.orig Mon Nov 6 14:17:22 2000 -+++ Makefile.cfg Wed Jun 27 14:46:28 2001 -@@ -1,4 +1,5 @@ - # General defines -+include ${root}/localport.cfg - - version := 1.5.1a - -@@ -19,18 +20,18 @@ - - # shared library- set to yes if you would like to build - --buildshare := no -+buildshare := yes - - - # VCL library- set to yes if you would like to build - --buildvcl := yes -+buildvcl := no - - - # Debugging options etc... - --debug := yes --profile := yes -+debug := no -+profile := no - - - # endian, etc. support for other hardware -@@ -50,13 +51,12 @@ - +--- Makefile.cfg.orig Thu Dec 13 10:44:49 2001 ++++ Makefile.cfg Thu Dec 13 10:47:07 2001 +@@ -6,7 +6,7 @@ # ownership (used by 'make install') --user := root -+user := sword - group := sword + user := root +-group := root ++group := wheel - # paths + # this WILL NOT WORK for you. only inhouse patched version of +@@ -60,8 +60,6 @@ --instdir := /usr/local/sword/ + # paths +-instdir := /usr +- bindir := ${instdir}/bin libdir := ${instdir}/lib -@@ -74,9 +74,9 @@ - - WARNINGS = -Wall -Wno-format + hdir := ${instdir}/include/sword +@@ -80,7 +78,7 @@ + WARNINGS = -Wall -Wno-format -pedantic #WARNINGS += -Werror + WARNINGS += -pedantic -CFLAGS = -pipe $(WARNINGS) $(DEBUG) -+CFLAGS += -pipe $(WARNINGS) $(DEBUG) ++CFLAGS += -pipe $(WARNINGS) $(DEBUG) --CPPFLAGS = -I${root}/include/ $(DEFINES) -+CPPFLAGS += -I${root}/include/ $(DEFINES) + CPPFLAGS = -I${root}/include/ $(DEFINES) ifeq ($(system),macosx) - CPPFLAGS += -I/System/Library/Frameworks/System.framework/Headers/ - endif -@@ -89,7 +89,7 @@ - LIBS += -lz - endif - --LDFLAGS = $(LFLAGS) $(LIBS) -+LDFLAGS += $(LFLAGS) $(LIBS) - - DEFINES = -D_GNU_SOURCE - -@@ -123,9 +123,9 @@ - endif - +@@ -89,7 +87,7 @@ + CPPFLAGS += $(DEFINES) --ifeq ($(system),intel) --CFLAGS += -m486 --endif -+#ifeq ($(system),intel) -+#CFLAGS += -m486 -+#endif + LFLAGS = $(OPTIMIZE) $(DEBUG) -L${root}/lib/ +-LIBS = -lsword -lstdc++ ++LIBS += -lsword -lstdc++ - ifeq ($(buildvcl),yes) - ifeq ($(root),.) + ifeq ($(zlib),no) + CFLAGS += -DEXCLUDEZLIB |