--- Makefile.orig	2006-08-16 00:23:23.000000000 +0000
+++ Makefile	2006-08-16 00:24:44.000000000 +0000
@@ -8,7 +8,6 @@
 doc_files	:= docs INSTALL CREDITS FAQ GNUGPL HELP README TODO AGREEMENT remote.help
 
 FILES_TO_INSTALL := *.tcl hotmlog.htm sndplay amsn amsn-remote amsn-remote-CLI amsn.desktop langlist
-FILES_TO_INSTALL += $(doc_files)
 FILES_TO_INSTALL += icons lang skins utils/base64 utils/drawboard utils/framec utils/http2.4
 FILES_TO_INSTALL += utils/pixmapscroll
 FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit0.97 utils/BWidget-1.7.0
@@ -137,76 +136,28 @@
 
 
 install:: $(FILES_TO_INSTALL)
-	rm -Rf $(dstdir)/$(PACKAGE)
-	mkdir --parents $(dstdir)/$(PACKAGE)
-	mkdir -p $(slnkdir)
+	rm -Rf $(DESTDIR)/$(dstdir)/$(PACKAGE)
+	mkdir --parents $(DESTDIR)/$(dstdir)/$(PACKAGE)
+	mkdir -p $(DESTDIR)/$(slnkdir)
 	@for p in $?; do \
-			cp -Rf --parents $(srcdir)/$$p $(dstdir)/$(PACKAGE); \
+			cp -Rf --parents $(srcdir)/$$p $(DESTDIR)/$(dstdir)/$(PACKAGE); \
 		done
-	find $(dstdir)/$(PACKAGE) -name CVS -print | xargs rm -Rf
+	find $(DESTDIR)/$(dstdir)/$(PACKAGE) -name CVS -print | xargs rm -Rf
 	@for p in $(FILES_TO_EXCLUDE); do \
-			rm -Rf $(dstdir)/$(PACKAGE)/$$p; \
+			rm -Rf $(DESTDIR)/$(dstdir)/$(PACKAGE)/$$p; \
 		done
 
-	ln -sf $(dstdir)/$(PACKAGE)/amsn $(slnkdir)/amsn
-	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(slnkdir)/amsn-remote
-	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(slnkdir)/amsn-remote-CLI
+	ln -sf $(dstdir)/$(PACKAGE)/amsn $(DESTDIR)/$(slnkdir)/amsn
+	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(DESTDIR)/$(slnkdir)/amsn-remote
+	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(DESTDIR)/$(slnkdir)/amsn-remote-CLI
 
-	chmod -R +rx $(dstdir)/$(PACKAGE)
+	chmod +rx $(DESTDIR)/$(dstdir)/$(PACKAGE)/{amsn,amsn-remote,amsn-remote-CLI}
 	
-	mkdir -p $(dstdir)/icons/hicolor
-	cp -R $(srcdir)/icons/* $(dstdir)/icons/hicolor
+	mkdir -p $(DESTDIR)/$(dstdir)/icons/hicolor
+	cp -R $(srcdir)/icons/* $(DESTDIR)/$(dstdir)/icons/hicolor
 
-	mkdir -p $(dstdir)/applications
-	cp $(srcdir)/amsn.desktop $(dstdir)/applications
-
-rpm-install:: $(FILES_TO_INSTALL)
-	rm -Rf $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE)
-	mkdir --parents $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE)
-	@for p in $?; do \
-			cp -Rf --parents $(srcdir)/$$p $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE); \
-		done
-	find $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE) -name CVS -print | xargs rm -Rf
-	@for p in $(FILES_TO_EXCLUDE); do \
-			rm -Rf $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE)/$$p; \
-		done
-	mkdir --parents $(INSTALL_PREFIX)/$(slnkdir)
-
-	ln -sf $(dstdir)/$(PACKAGE)/amsn $(INSTALL_PREFIX)/$(slnkdir)/amsn
-	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(INSTALL_PREFIX)/$(slnkdir)/amsn-remote
-	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(INSTALL_PREFIX)/$(slnkdir)/amsn-remote-CLI
-
-rpm: all
-	mkdir -p ./distrib
-
-	rm -f THIS.TK.SPEC
-	echo "%define _builddir `pwd`" > THIS.AMSN.SPEC
-	echo "%define _rpmdir /tmp/RPMS" >> THIS.AMSN.SPEC
-	echo "%define _prefix $(prefix)" >> THIS.AMSN.SPEC
-	echo "%define _tmppath /tmp" >> THIS.AMSN.SPEC
-	echo "%define _datadir $(dstdir)/$(PACKAGE)" >> THIS.AMSN.SPEC
-	echo "%define _bindir $(slnkdir)" >> THIS.AMSN.SPEC
-	echo "%define _doc_files $(doc_files)" >> THIS.AMSN.SPEC
-	echo "%define _platform `uname -m`" >> THIS.AMSN.SPEC
-	echo "%define _version $(BASEVERSION)" >> THIS.AMSN.SPEC
-	echo "%define __release $(RELEASEVERSION)" >> THIS.AMSN.SPEC
-
-	cat amsn.spec >> THIS.AMSN.SPEC
-	mkdir -p /tmp/RPMS
-	rpmbuild -bb THIS.AMSN.SPEC
-	rm -rf ./distrib/RPMS
-	mv /tmp/RPMS ./distrib
-	rm -rf /tmp/RPMS THIS.AMSN.SPEC
-
-deb: all
-	mkdir -p ./distrib/DEB
-
-	sed "1s/#VERSION#/${VERSION}/" debian/changelog.in > debian/changelog
-	fakeroot debian/rules clean
-	fakeroot debian/rules binary VERSION=${VERSION}
-
-	rm -f debian/changelog
-	rm -rf debian/amsn
+	mkdir -p $(DESTDIR)/$(dstdir)/applications
+	cp $(srcdir)/amsn.desktop $(DESTDIR)/$(dstdir)/applications
 
 #########################################################
 # include stuff