--- sourceforge.net/trunk/rdesktop/Makefile	2002/08/06 17:42:04	95
+++ sourceforge.net/trunk/rdesktop/Makefile	2002/10/08 02:26:59	215
@@ -7,51 +7,49 @@
 # Configuration defaults
 
 CC       = cc
-CFLAGS   = -O2 -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
-INCLUDES = -I/usr/X11R6/include
-LDLIBS   = -L/usr/X11R6/lib -lX11 -lXext
-
-PREFIX   = /usr/local
-EPREFIX  = $(PREFIX)
-BINDIR   = $(EPREFIX)/bin
-# MANDIR   = $(PREFIX)/man
-SHAREDIR = $(PREFIX)/share/rdesktop
+CFLAGS   = -Wall -O2 -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
+LDFLAGS  =
 
-KEYMAP_PATH = $(SHAREDIR)/keymaps/
+prefix      = /usr/local
+exec_prefix = $(prefix)
+bindir      = $(exec_prefix)/bin
+mandir      = $(prefix)/man
+datadir     = $(prefix)/share/rdesktop
+
+KEYMAP_PATH = $(datadir)/keymaps/
 
 RDPOBJ   = rdesktop.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o xwin.o xkeymap.o
 CRYPTOBJ = crypto/rc4_enc.o crypto/rc4_skey.o crypto/md5_dgst.o crypto/sha1dgst.o crypto/bn_exp.o crypto/bn_mul.o crypto/bn_div.o crypto/bn_sqr.o crypto/bn_add.o crypto/bn_shift.o crypto/bn_asm.o crypto/bn_ctx.o crypto/bn_lib.o
 
-include Makeconf  # local configuration
+include Makeconf  # configure-generated
 
 
 rdesktop: $(RDPOBJ) $(CRYPTOBJ)
-	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDDIRS) $(LDLIBS)
+	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS)
 
 Makeconf:
 	./configure
 
-install: installbin installkeymaps
+install: installbin installkeymaps installman
 
 installbin: rdesktop
-	mkdir -p $(BINDIR)
-	cp rdesktop $(BINDIR)
-	strip $(BINDIR)/rdesktop
-	chmod 755 $(BINDIR)/rdesktop
-
-# installman: rdesktop.1
-#	mkdir -p $(MANDIR)/man1
-#	cp rdesktop.1 $(MANDIR)/man1
-#	chmod 755 $(MANDIR)/man1/rdesktop.1
+	mkdir -p $(DESTDIR)/$(bindir)
+	install rdesktop $(DESTDIR)/$(bindir)
+	strip $(DESTDIR)/$(bindir)/rdesktop
+	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
+
+installman: doc/rdesktop.1
+	mkdir -p $(DESTDIR)/$(mandir)/man1
+	cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
+	chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1
 
 installkeymaps:
-	mkdir -p $(KEYMAP_PATH)
+	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
 # Prevent copying the CVS directory
-	cp keymaps/?? $(KEYMAP_PATH)
-	cp keymaps/common $(KEYMAP_PATH)
-	cp keymaps/modifiers $(KEYMAP_PATH)
-	cp keymaps/README $(KEYMAP_PATH)
-	chmod 644 $(KEYMAP_PATH)/*
+	cp keymaps/?? $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
+	chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/*
 
 proto:
 	cproto -DMAKE_PROTO -o proto.h *.c
@@ -74,17 +72,18 @@
 	rdesktop/keymaps/?? \
 	rdesktop/keymaps/modifiers \
 	rdesktop/keymaps/convert-map \
-	rdesktop/keymaps/README \
 	rdesktop/doc/HACKING \
 	rdesktop/doc/TODO \
+	rdesktop/doc/keymapping.txt \
+	rdesktop/doc/rdesktop.1 \
 	rdesktop/Makefile \
 	rdesktop/configure \
-	rdesktop/rdesktop.spec)	
+	rdesktop/rdesktop.spec)
 	rm -rf /tmp/rdesktop-make-dist-dir
 
 .SUFFIXES:
 .SUFFIXES: .c .o
 
 .c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -o $@ -c $<
+	$(CC) $(CFLAGS) -o $@ -c $<