- include LOCALBASE instead of PREFIX, and make this port PREFIX-clean
This commit is contained in:
parent
1778f88fb5
commit
31bc14c6ae
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=120165
@ -6,8 +6,8 @@
|
||||
C2FLAGS = -Wall $(DEFS) -shared -Wl,-soname,libupnp.so
|
||||
-INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools
|
||||
-LIBS = -lpthread -luuid
|
||||
+INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools -I $(PREFIX)/include
|
||||
+LIBS = ${PTHREAD_LIBS} -luuid -L$(PREFIX)/lib
|
||||
+INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools -I $(LOCALBASE)/include
|
||||
+LIBS = ${PTHREAD_LIBS} -luuid -L$(LOCALBASE)/lib
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CFLAGS += -g -O -DDEBUG
|
||||
|
@ -5,7 +5,7 @@
|
||||
TARGET = $(upnp_lib_dir)/gena.o
|
||||
|
||||
-CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -fpic -Wall -c -D_REENTRANT
|
||||
+CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -I$(PREFIX)/include -fpic -Wall -c -D_REENTRANT
|
||||
+CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -I$(LOCALBASE)/include -fpic -Wall -c -D_REENTRANT
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CFLAGS += -g -O -DDEBUG
|
||||
|
@ -6,8 +6,8 @@
|
||||
C2FLAGS = -Wall $(DEFS) -shared -Wl,-soname,libupnp.so
|
||||
-INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools
|
||||
-LIBS = -lpthread -luuid
|
||||
+INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools -I $(PREFIX)/include
|
||||
+LIBS = ${PTHREAD_LIBS} -luuid -L$(PREFIX)/lib
|
||||
+INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools -I $(LOCALBASE)/include
|
||||
+LIBS = ${PTHREAD_LIBS} -luuid -L$(LOCALBASE)/lib
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CFLAGS += -g -O -DDEBUG
|
||||
|
@ -5,7 +5,7 @@
|
||||
TARGET = $(upnp_lib_dir)/gena.o
|
||||
|
||||
-CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -fpic -Wall -c -D_REENTRANT
|
||||
+CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -I$(PREFIX)/include -fpic -Wall -c -D_REENTRANT
|
||||
+CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -I$(LOCALBASE)/include -fpic -Wall -c -D_REENTRANT
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CFLAGS += -g -O -DDEBUG
|
||||
|
Loading…
Reference in New Issue
Block a user