mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

audio/taglookup: Respect CXXFLAGS (PHB 12.9)

Browse Source 
While here, fix LDFLAGS and use the BSD_INSTALL_* macros instead of
hardcoding modes.

Approved by:	blanket
This commit is contained in:
John Marino 2015-02-19 09:04:48 +00:00
parent dadadc8ced
commit 336e01bba7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=379334
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
audio/taglookup/files/patch-Makefile
View File

@ -1,22 +1,27 @@
--- ./Makefile.orig 2007-10-29 13:02:54.000000000 +0100
+++ ./Makefile 2014-04-07 10:15:45.329720325 +0200
@@ -4,7 +4,7 @@
--- Makefile.orig 2007-10-29 12:02:54 UTC
+++ Makefile
@@ -4,10 +4,10 @@ LIBCDDB_LIBRARY = `pkg-config --libs lib
TAGLIB_INCLUDE = `taglib-config --cflags`
TAGLIB_LIBRARY = `taglib-config --libs`
-CPP = g++
+CPP = $(CXX)
CPPFLAGS = -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
LDFLAGS = $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
@@ -18,8 +18,8 @@
-CPPFLAGS = -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
-LDFLAGS = $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
+CPPFLAGS = ${CXXFLAGS} -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
+LDFLAGS+= $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
OBJ = cddb_query.o cddb_query_impl.o command_line.o main.o tag.o tracks.o
EXE = taglookup
@@ -18,8 +18,8 @@ EXE = taglookup
all: $(EXE)
install: $(EXE)
- $(INSTALL) -c -o root -g wheel -m 644 taglookup.1 $(PREFIX)/man/man1/taglookup.1
- $(INSTALL) -c -o root -g wheel -m 755 $(EXE) $(PREFIX)/bin/taglookup
+ $(INSTALL) -c -m 644 taglookup.1 $(DESTDIR)$(PREFIX)/man/man1/taglookup.1
+ $(INSTALL) -c -m 755 $(EXE) $(DESTDIR)$(PREFIX)/bin/taglookup
+ $(BSD_INSTALL_MAN) taglookup.1 $(DESTDIR)$(PREFIX)/man/man1/taglookup.1
+ $(BSD_INSTALL_PROGRAM) $(EXE) $(DESTDIR)$(PREFIX)/bin/taglookup
$(EXE): $(OBJ)
$(CPP) $(LDFLAGS) $(OBJ) -o $(EXE)