sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't create ${LOCALBASE}/${LOCALBASE}/{lib,include} directories on installation.

Browse source
This commit is contained in:
Maxim Sobolev 2007-05-01 01:48:00 +00:00
parent 086ad81b2c
commit fe6faddcd4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=191247
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
misc/libpri/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= libpri PORTNAME= libpri
PORTVERSION= 1.4.0 PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= ftp://ftp.digium.com/pub/libpri/ \ MASTER_SITES= ftp://ftp.digium.com/pub/libpri/ \
ftp://ftp.digium.com/pub/libpri/old/ ftp://ftp.digium.com/pub/libpri/old/

21
misc/libpri/files/patch-Makefile
View file

@ -3,7 +3,7 @@ $FreeBSD$
--- Makefile.orig --- Makefile.orig
+++ Makefile +++ Makefile
@@ -27,7 +27,7 @@ @@ -27,19 +27,19 @@
# Uncomment if you want libpri to count number of Q921/Q931 sent/received # Uncomment if you want libpri to count number of Q921/Q931 sent/received
#LIBPRI_COUNTERS=-DLIBPRI_COUNTERS #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
@ -12,9 +12,7 @@ $FreeBSD$
OSARCH=$(shell uname -s) OSARCH=$(shell uname -s)
PROC?=$(shell uname -m) PROC?=$(shell uname -m)
@@ -35,13 +35,13 @@
TOBJS=testpri.o
T2OBJS=testprilib.o
STATIC_LIBRARY=libpri.a STATIC_LIBRARY=libpri.a
-DYNAMIC_LIBRARY=libpri.so.1.0 -DYNAMIC_LIBRARY=libpri.so.1.0
+DYNAMIC_LIBRARY=libpri.so.1 +DYNAMIC_LIBRARY=libpri.so.1
@ -29,11 +27,16 @@ $FreeBSD$
+INSTALL_BASE= +INSTALL_BASE=
+SOFLAGS = -Wl,-hlibpri.so.1 +SOFLAGS = -Wl,-hlibpri.so.1
LDCONFIG = /sbin/ldconfig LDCONFIG = /sbin/ldconfig
ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD)) ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
LDCONFIG_FLAGS=-n LDCONFIG_FLAGS=-n
@@ -84,12 +84,11 @@ @@ -77,15 +77,14 @@
mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib fi
mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
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) ifneq (${OSARCH},SunOS)
- install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include - install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
@ -49,7 +52,7 @@ $FreeBSD$
else else
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
@@ -130,10 +129,6 @@ @@ -126,10 +125,6 @@
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)