--- sourceforge.net/trunk/rdesktop/Makefile	2001/09/15 12:34:34	33
+++ sourceforge.net/trunk/rdesktop/Makefile	2002/09/14 15:00:11	125
@@ -7,39 +7,59 @@
 # Configuration defaults
 
 CC       = cc
-CFLAGS   = -O2
-INCLUDES = -I/usr/X11R6/include
-LDLIBS   = -L/usr/X11R6/lib -lX11
+X11DIR   = /usr/X11R6
+CFLAGS   = -O2 -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
+INCLUDES = -I$(X11DIR)/include
+LDFLAGS  = -L$(X11DIR)/lib -lX11 -lXext
 
 PREFIX   = /usr/local
 EPREFIX  = $(PREFIX)
 BINDIR   = $(EPREFIX)/bin
 MANDIR   = $(PREFIX)/man
+SHAREDIR = $(PREFIX)/share/rdesktop
+KEYMAP_PATH = $(SHAREDIR)/keymaps/
 
-RDPOBJ   = rdesktop.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o xwin.o
+OS = $(shell uname -s)
+
+ifeq "$(OS)" "SunOS"
+LDFLAGS += -lsocket -lnsl -R$(X11DIR)/lib
+endif
+ifeq "$(OS)" "OSF1"
+LDFLAGS += -Wl,-rpath,$(X11DIR)/lib
+endif
+
+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 readpass.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
 
 
 rdesktop: $(RDPOBJ) $(CRYPTOBJ)
-	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDDIRS) $(LDLIBS)
+	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS)
 
 Makeconf:
 	./configure
 
-install: installbin
+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 $(DESTDIR)/$(KEYMAP_PATH)
+# Prevent copying the CVS directory
+	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
@@ -47,6 +67,30 @@
 clean:
 	rm -f *.o crypto/*.o *~ rdesktop
 
+dist:
+	mkdir -p /tmp/rdesktop-make-dist-dir
+	ln -sf `pwd` /tmp/rdesktop-make-dist-dir/rdesktop
+	(cd /tmp/rdesktop-make-dist-dir; \
+	tar zcvf rdesktop/rdesktop.tgz \
+	rdesktop/COPYING \
+	rdesktop/crypto/README \
+	rdesktop/crypto/*.c \
+	rdesktop/crypto/*.h \
+	rdesktop/*.c \
+	rdesktop/*.h \
+	rdesktop/keymaps/common \
+	rdesktop/keymaps/?? \
+	rdesktop/keymaps/modifiers \
+	rdesktop/keymaps/convert-map \
+	rdesktop/doc/HACKING \
+	rdesktop/doc/TODO \
+	rdesktop/doc/keymapping.txt \
+	rdesktop/doc/rdesktop.1 \
+	rdesktop/Makefile \
+	rdesktop/configure \
+	rdesktop/rdesktop.spec)
+	rm -rf /tmp/rdesktop-make-dist-dir
+
 .SUFFIXES:
 .SUFFIXES: .c .o