6c2da07583
Addresses PR pkg/21595 by Juan RP. Changes: - install README file - install files in cleaner way - DESCR has 80 columns 1.0.24: ======= - Added Rob Eberts patch which changes the size of the titlebar, adds some keybindings to switch desktops with alt+number keys. 1.0.23: ======= - Menu correctly gets DEF_FONT (but not yet opt_font)
48 lines
1.4 KiB
Text
48 lines
1.4 KiB
Text
$NetBSD: patch-aa,v 1.2 2003/05/16 09:02:37 salo Exp $
|
|
|
|
--- Makefile.orig 2002-11-16 00:28:08.000000000 +0100
|
|
+++ Makefile 2003-05-16 10:48:03.000000000 +0200
|
|
@@ -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${X11PREFIX}/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 @@
|
|
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)/man/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
|