diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-11 12:16:46 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-11 12:16:46 +0000 |
| commit | 9f8af46fe4a568423733d9179e88747244b0b9cd (patch) | |
| tree | f3ab45b366281cefd0ec9c353c7520ec67a3eadc /devel | |
| parent | PREFIX and other Makefile cleanups along with WWW addition. (diff) | |
PREFIX and other Makefile changes, plus WWW addition.
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=35010
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libshhmsg/files/patch-aa | 54 | ||||
| -rw-r--r-- | devel/libshhmsg/pkg-comment | 2 | ||||
| -rw-r--r-- | devel/libshhmsg/pkg-descr | 4 |
3 files changed, 38 insertions, 22 deletions
diff --git a/devel/libshhmsg/files/patch-aa b/devel/libshhmsg/files/patch-aa index cf4a685feab4..6a33658b38dc 100644 --- a/devel/libshhmsg/files/patch-aa +++ b/devel/libshhmsg/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.orig Tue Oct 13 13:11:42 1998 -+++ Makefile Fri Apr 2 15:33:32 1999 -@@ -6,10 +6,10 @@ +--- Makefile.orig Wed Oct 14 03:11:42 1998 ++++ Makefile Tue Jul 4 21:39:46 2000 +@@ -6,7 +6,7 @@ VERSION = $(VERMAJ).$(VERMIN).$(VERPAT) # Define SHARED as 1 for Linux shared ELF library @@ -8,39 +8,53 @@ +SHARED = 1 ifeq ($(SHARED),1) --LIBTARGET = lib$(DIST).so.$(VERSION) -+LIBTARGET = lib$(DIST).so.$(VERMAJ) - LIBTARGETSO = lib$(DIST).so - LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ) - CCSHRD = -fPIC -@@ -23,8 +23,8 @@ - INSTBASEDIR = /usr/local + LIBTARGET = lib$(DIST).so.$(VERSION) +@@ -20,19 +20,19 @@ + LIBHEAD = $(DIST).h + TARGETS = $(LIBTARGET) + +-INSTBASEDIR = /usr/local ++INSTBASEDIR = ${PREFIX} INSTLIBDIR = $(INSTBASEDIR)/lib INSTINCDIR = $(INSTBASEDIR)/include -INSTALL = install -m 644 -INSTALLPROG = install -m 755 -+INSTALL = install -c -m 644 -+INSTALLPROG = install -c -m 755 - MKDIRP = install -d -m 755 +-MKDIRP = install -d -m 755 ++INSTALL = ${BSD_INSTALL_DATA} ++INSTALLPROG = ${BSD_INSTALL_PROGRAM} ++MKDIRP = mkdir -p - CC = gcc -@@ -32,7 +32,7 @@ +-CC = gcc ++#CC = gcc + OPTIM = -O2 INCDIR = -I. -CCOPT = -s -Wall $(OPTIM) $(INCDIR) -+CCOPT = -s -Wall $(OPTIM) $(INCDIR) -D_POSIX_SOURCE ++CCOPT = $(INCDIR) $(CFLAGS) # Object files to store in the library LIBOBJS = vars.o streams.o progname.o \ -@@ -59,9 +59,7 @@ - $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) +@@ -43,7 +43,7 @@ + + $(LIBTARGET): $(LIBOBJS) + ifeq ($(SHARED),1) +- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) ++ $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS) + else + ar rcs $(LIBTARGET) $(LIBOBJS) + endif +@@ -56,12 +56,10 @@ + + install: $(LIBTARGET) + $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR) +- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) ++ $(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR) $(INSTALL) $(LIBHEAD) $(INSTINCDIR) ifeq ($(SHARED),1) - ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ) -- ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) + ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) - echo "If you use GNU/Linux, remember to run ldconfig" -+ ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO) endif clean: diff --git a/devel/libshhmsg/pkg-comment b/devel/libshhmsg/pkg-comment index 7d6d1843e903..ba7fc05ee12e 100644 --- a/devel/libshhmsg/pkg-comment +++ b/devel/libshhmsg/pkg-comment @@ -1 +1 @@ -A library for displaying messages +Library for displaying messages diff --git a/devel/libshhmsg/pkg-descr b/devel/libshhmsg/pkg-descr index e0665eaf18a5..3acf7d834322 100644 --- a/devel/libshhmsg/pkg-descr +++ b/devel/libshhmsg/pkg-descr @@ -1,3 +1,5 @@ shhmsg - library for displaying messages. It contains C-functions for error messages, verbose messages and -`normal' messages in terminalbased programs. +`normal' messages in terminal based programs. + +WWW: http://shh.thathost.com/pub-unix/#shhmsg |