--- qsampler/trunk/Makefile.in	2004/09/29 13:12:45	264
+++ qsampler/trunk/Makefile.in	2007/06/25 10:15:07	1255
@@ -8,6 +8,12 @@
 	src/qsamplerOptions.h \
 	src/qsamplerChannel.h \
 	src/qsamplerMessages.h \
+	src/qsamplerInstrument.h \
+	src/qsamplerInstrumentList.h \
+	src/qsamplerDevice.h \
+	src/qsamplerInstrumentForm.ui.h \
+	src/qsamplerInstrumentListForm.ui.h \
+	src/qsamplerDeviceForm.ui.h \
 	src/qsamplerChannelStrip.ui.h \
 	src/qsamplerChannelForm.ui.h \
 	src/qsamplerOptionsForm.ui.h \
@@ -17,6 +23,12 @@
 	src/qsamplerOptions.cpp \
 	src/qsamplerChannel.cpp \
 	src/qsamplerMessages.cpp \
+	src/qsamplerInstrument.cpp \
+	src/qsamplerInstrumentList.cpp \
+	src/qsamplerDevice.cpp \
+	src/qsamplerInstrumentForm.ui \
+	src/qsamplerInstrumentListForm.ui \
+	src/qsamplerDeviceForm.ui \
 	src/qsamplerChannelStrip.ui \
 	src/qsamplerChannelForm.ui \
 	src/qsamplerOptionsForm.ui \
@@ -28,15 +40,24 @@
 	@$(qmake) -o $(name).mak $(name).pro
 
 $(name):	$(name).mak $(sources) $(headers)
-	@make -f $(name).mak $(name)
+	@make -f $(name).mak
 
-install:	$(name) icons/$(name).png
-	@install -vD $(name) $(prefix)/bin/$(name)
-	@install -vD icons/$(name).png $(prefix)/share/icons/$(name).png
 
-uninstall:	$(prefix)/bin/$(name)
-	@rm -vf $(prefix)/bin/$(name)
-	@rm -vf $(prefix)/share/icons/$(name).xpm
+# NOTE: DO NOT DELETE $(DESTDIR) in install and uninstall rules !!!
+#       It is mandatory for Debian packaging.
+
+install:	$(name) icons/$(name).png
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
+	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
+	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
+	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
+
+uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
+	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
+	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
+	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
 
 clean:	$(name).mak
 	@make -f $(name).mak clean