$OpenBSD: patch-clients_Makefile,v 1.3 2005/01/10 00:30:23 jcs Exp $ --- clients/Makefile.orig Tue Nov 9 20:30:06 2004 +++ clients/Makefile Sun Jan 9 18:15:46 2005 @@ -5,15 +5,15 @@ # Uncomment to enable building with GTK+ 1.2 instead of 2.x. #USE_OLD_GTK = 1 -CC = gcc -CFLAGS = -g -O2 -Wall +#CC = gcc +#CFLAGS = -g -O2 -Wall AELIBDIR = ../lib MYLIBDIR = lib -XROOT = /usr/X11R6 -BINDIR = $(DESTDIR)$(XROOT)/bin -MANDIR = $(DESTDIR)$(XROOT)/man/man1 -CFGDIR = $(DESTDIR)/etc/X11/aewm +XROOT = ${X11BASE} +BINDIR = ${PREFIX}/bin +MANDIR = ${PREFIX}/man/man1 +CFGDIR = ${PREFIX}/share/examples/aewm INCLUDES = -I$(AELIBDIR) -I$(MYLIBDIR) X11PATH = -I$(XROOT)/include @@ -77,20 +77,19 @@ $(GTKOBJS): %.o: %.c $(CC) $(CFLAGS) $(INCLUDES) $(GTKPATH) -c $< -o $@ $(ETCOBJS): %.o: %.c - $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ + $(CC) $(CFLAGS) $(INCLUDES) $(X11PATH) -c $< -o $@ # -------------------------------------------------------------------- install: all - install -s $(ALLPROGS) $(BINDIR) - install -m 644 $(MANPAGE) $(MANDIR) - gzip -9vf $(MANDIR)/$(MANPAGE) + ${BSD_INSTALL_PROGRAM} $(ALLPROGS) $(BINDIR) + ${BSD_INSTALL_MAN} $(MANPAGE) $(MANDIR) mkdir -p $(CFGDIR) && cp clientsrc.sample $(CFGDIR)/clientsrc cd $(BINDIR) && ln -sf aemenu-gtk aemenu cd $(BINDIR) && ln -sf aepanel-gtk aepanel cd $(MANDIR) && \ for i in $(ALLPROGS); do \ - ln -sf $(MANPAGE).gz $$i.1x.gz; \ + ln -sf $(MANPAGE) $$i.1x; \ done \ clean: