diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2007-05-01 01:48:00 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2007-05-01 01:48:00 +0000 |
| commit | fe6faddcd446c53f5836d7f217fb65d51644046f (patch) | |
| tree | 9c8a9a76376a1de32a1c1174b338b199f8db217f /misc/libpri | |
| parent | 086ad81b2c0d9759c8686fe6e1b8dff74440db10 (diff) | |
| download | ports-fe6faddcd446c53f5836d7f217fb65d51644046f.tar.gz ports-fe6faddcd446c53f5836d7f217fb65d51644046f.zip | |
Don't create ${LOCALBASE}/${LOCALBASE}/{lib,include} directories on installation.
Notes
Notes:
svn path=/head/; revision=191247
Diffstat (limited to 'misc/libpri')
| -rw-r--r-- | misc/libpri/Makefile | 1 | ||||
| -rw-r--r-- | misc/libpri/files/patch-Makefile | 21 |
2 files changed, 13 insertions, 9 deletions
diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile index 325d2b5ef8ac..cc4b7461258d 100644 --- a/misc/libpri/Makefile +++ b/misc/libpri/Makefile @@ -7,6 +7,7 @@ PORTNAME= libpri PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ftp://ftp.digium.com/pub/libpri/ \ ftp://ftp.digium.com/pub/libpri/old/ diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile index c38b3fd90f4b..a579cef726bd 100644 --- a/misc/libpri/files/patch-Makefile +++ b/misc/libpri/files/patch-Makefile @@ -3,7 +3,7 @@ $FreeBSD$ --- Makefile.orig +++ Makefile -@@ -27,7 +27,7 @@ +@@ -27,19 +27,19 @@ # Uncomment if you want libpri to count number of Q921/Q931 sent/received #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS @@ -12,9 +12,7 @@ $FreeBSD$ OSARCH=$(shell uname -s) PROC?=$(shell uname -m) -@@ -35,13 +35,13 @@ - TOBJS=testpri.o - T2OBJS=testprilib.o + STATIC_LIBRARY=libpri.a -DYNAMIC_LIBRARY=libpri.so.1.0 +DYNAMIC_LIBRARY=libpri.so.1 @@ -29,11 +27,16 @@ $FreeBSD$ +INSTALL_BASE= +SOFLAGS = -Wl,-hlibpri.so.1 LDCONFIG = /sbin/ldconfig - ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD)) + ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX)) LDCONFIG_FLAGS=-n -@@ -84,12 +84,11 @@ - mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include +@@ -77,15 +77,14 @@ + fi + + install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) +- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib +- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include ++ mkdir -p $(INSTALL_PREFIX)/lib ++ mkdir -p $(INSTALL_PREFIX)/include ifneq (${OSARCH},SunOS) - install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include - install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib @@ -49,7 +52,7 @@ $FreeBSD$ else install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) -@@ -130,10 +129,6 @@ +@@ -126,10 +125,6 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) |