[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / wm / aewm++ / patches
File: [cvs.NetBSD.org] / pkgsrc / wm / aewm++ / patches / patch-aa (download)

Revision 1.4, Sat Jul 4 16:18:41 2015 UTC (8 years, 3 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, HEAD
Changes since 1.3: +2 -2 lines 

Remove USE_X11BASE and X11PREFIX.

$NetBSD: patch-aa,v 1.4 2015/07/04 16:18:41 joerg Exp $

--- Makefile.orig	2002-11-15 23:28:08.000000000 +0000
+++ Makefile
@@ -1,11 +1,13 @@
-CC       = g++
-CFLAGS   = -g -O2 -Wall
+#CC       = g++
+#CFLAGS   = -g -O2 -Wall
 
-prefix   = /usr
-INCLUDES = -I$(prefix)/include
-LDPATH   = -L/usr/X11R6/lib
+prefix   = ${PREFIX}
+INCLUDES = -I${X11BASE}/include
+LDPATH   = ${LDFLAGS}
 LIBS     = -lXext -lX11
 
+.SUFFIXES:	.o .cc
+
 # SHAPE = Shape Extension
 # NEED_SETENV = Does your Unix not support the setenv function? Use this!
 DEFINES  = -DSHAPE #-DNEED_SETENV 
@@ -28,16 +30,17 @@ OBJS     = windowmanager.o 	\
 all: aewm++
 
 aewm++: $(OBJS)
-	$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
+	$(CXX) $(OBJS) $(LDPATH) $(LIBS) -o $@
 
-$(OBJS): %.o: %.cc $(HEADERS)
-	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
+.cc.o: $(HEADERS)
+	echo $<
+	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
 
 install: all
-	mkdir -p $(DESTDIR)$(prefix)/bin
-	mkdir -p $(DESTDIR)$(prefix)/man/man1
-	install -s aewm++ $(DESTDIR)$(prefix)/bin
-	install -m 644 aewm++.1x  $(DESTDIR)$(prefix)/man/man1
+	${BSD_INSTALL_PROGRAM} aewm++ $(DESTDIR)$(prefix)/bin
+	${BSD_INSTALL_MAN} aewm++.1x  $(DESTDIR)$(prefix)/$(PKGMANDIR)/man1/aewm++.1
+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/doc/aewm++
+	${BSD_INSTALL_DATA} README $(DESTDIR)$(prefix)/share/doc/aewm++
 	
 clean:
 	rm -f aewm++ $(OBJS) core