--- qsampler/trunk/Makefile.in	2011/11/13 20:29:46	2282
+++ qsampler/trunk/Makefile.in	2012/04/13 04:18:41	2342
@@ -71,44 +71,40 @@
 	src/translations/qsampler_cs.qm \
 	src/translations/qsampler_ru.qm
 
+
+export datarootdir = @datarootdir@
+export localedir = @localedir@
+
+
 all:	$(target) $(translations_targets)
 
 
 $(target):	$(name).mak $(resources) ${forms} $(sources) $(headers)
-	@make -f $(name).mak
+	@$(MAKE) -f $(name).mak
 
 $(name).mak:	$(name).pro
 	@$(qmake) -o $(name).mak $(name).pro
 
-
-%.ts:	$(name).pro $(resources) ${forms} $(sources) $(headers)
+$(translation_targets):	$(name).pro
 	@$(lupdate) -verbose $(name).pro
 
 %.qm:	%.ts
 	@$(lrelease) -verbose $< -qm $@
 
 
-exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
-
-export bindir = @bindir@
-export datadir = @datadir@
-export localedir = @localedir@
-
-
 install:	$(target) $(translations_targets)
-	@make INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
+	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
 	@install -d -v -m 0755 $(DESTDIR)$(localedir)
 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(localedir)
 
-uninstall:	$(DESTDIR)$(bindir)/$(name)
-	@make INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
+uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
+	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
 	@rm -vf $(DESTDIR)$(localedir)/$(translations_targets)
 	@for x in $(translations_targets); do \
 		rm -vf $(DESTDIR)$(localedir)/`basename $$x`; done
 
 
 clean:	$(name).mak
-	@make -f $(name).mak clean
+	@$(MAKE) -f $(name).mak clean
 	@rm -f $(target) $(target).mak $(name).mak
 	@rm -rf *.cache *.log *.status $(translations_targets)