File slim-1.3.2-makefile.patch of Package slim

diff -uNr old-slim-1.3.2//Makefile slim-1.3.2/Makefile
--- old-slim-1.3.2//Makefile	2010-07-08 07:04:10.000000000 +0200
+++ slim-1.3.2/Makefile	2010-07-29 11:22:32.717314387 +0200
@@ -3,27 +3,34 @@
 # Edit the following section to adjust the options
 # to fit into your operating system / distribution
 #######################################################
-CXX=/usr/bin/g++
-CC=/usr/bin/gcc
-CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
-CXXFLAGS=$(CFLAGS)
-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
+CXX=g++
+CC=gcc
+INSTALL=install
 CUSTOM=-DHAVE_SHADOW
-ifdef USE_PAM
-LDFLAGS+= -lpam
-CUSTOM+= -DUSE_PAM
-endif
 PREFIX=/usr
 CFGDIR=/etc
-MANDIR=/usr/man
+DATADIR=$(PREFIX)/share
+MANDIR=$(DATADIR)/man
+BINDIR=$(PREFIX)/bin
+LIBDIR=$(PREFIX)/lib
+INCLUDEDIR=$(PREFIX)/include
 DESTDIR=
+OPTFLAGS=
+CFLAGS=$(OPTFLAGS) -I. -I$(INCLUDEDIR) -I$(INCLUDEDIR)/freetype2 -I$(INCLUDEDIR)/freetype2/config -I$(INCLUDEDIR)/libpng12
+CXXFLAGS=$(CFLAGS)
+LDFLAGS=-L$(LIBDIR)
+LIBS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng12 -ljpeg -lrt
+ifdef USE_PAM
+LIBS+= -lpam
+CUSTOM+= -DUSE_PAM
+endif
 #######################################################
 
 NAME=slim
 VERSION=1.3.2
 
 DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
-		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
+		-DPKGDATADIR=\"$(DATADIR)/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
 
 OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o util.o
 ifdef USE_PAM
@@ -33,7 +40,7 @@
 all: slim
 
 slim: $(OBJECTS)
-	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME)
+	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME) $(LIBS)
 
 .cpp.o:
 	$(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
@@ -42,10 +49,10 @@
 	$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
 
 install: slim install-theme
-	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
-	install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
+	$(INSTALL) -D -m 755 slim $(DESTDIR)$(BINDIR)/slim
+	$(INSTALL) -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
 	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
-		install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
+		$(INSTALL) -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
 
 clean:
 	@rm -f slim *.o
@@ -61,9 +68,9 @@
 
 
 install-theme:
-	install -D -m 644 themes/default/slim.theme \
-		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme
-	install -D -m 644 themes/default/panel.png \
-		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png
-	install -D -m 644 themes/default/background.jpg \
-		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg
+	$(INSTALL) -D -m 644 themes/default/slim.theme \
+		 $(DESTDIR)$(DATADIR)/slim/themes/default/slim.theme
+	$(INSTALL) -D -m 644 themes/default/panel.png \
+		 $(DESTDIR)$(DATADIR)/slim/themes/default/panel.png
+	$(INSTALL) -D -m 644 themes/default/background.jpg \
+		 $(DESTDIR)$(DATADIR)/slim/themes/default/background.jpg