--- hatari/python-ui/Makefile	2019/04/09 08:46:58	1.1.1.1
+++ hatari/python-ui/Makefile	2019/04/09 08:47:51	1.1.1.2
@@ -9,9 +9,8 @@ include ../Makefile.cnf
 
 prefix ?= /usr
 
-BINPATH  = $(DESTDIR)$(BINDIR)
-SCRIPT   = $(BINPATH)/hatariui
-DATAPATH = $(DESTDIR)$(DATADIR)/hatariui
+SCRIPT   = $(BINDIR)/hatariui
+DATAPATH = $(DATADIR)/hatariui
 ICONPATH = $(prefix)/share/icons/hicolor/32x32/apps
 DESKPATH = $(prefix)/share/applications
 
@@ -19,15 +18,15 @@ all:
 	@echo "Nothing to build, just do 'make install'"
 
 install:
-	$(INSTALL) -d $(BINPATH)
-	$(INSTALL_SCRIPT) hatari-console.py $(BINPATH)/
-	sed "s%^path=.*$$%path=$(DATAPATH)%" hatariui > $(SCRIPT)
-	chmod 755 $(SCRIPT)
-	$(INSTALL) -d $(DATAPATH)
-	$(INSTALL_SCRIPT) hatariui.py debugui.py $(DATAPATH)/
-	$(INSTALL_DATA) config.py dialogs.py hatari.py uihelpers.py $(DATAPATH)/
-	$(INSTALL_DATA) README TODO Changelog *.png $(DATAPATH)/
-	$(INSTALL) -d $(ICONPATH)
-	$(INSTALL_DATA) hatari-icon.png $(ICONPATH)/
-	$(INSTALL) -d $(DESKPATH)
-	$(INSTALL_DATA) hatariui.desktop $(DESKPATH)/
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL_SCRIPT) hatari-console.py $(DESTDIR)$(BINDIR)/
+	sed "s%^path=.*$$%path=$(DATAPATH)%" hatariui > $(DESTDIR)$(SCRIPT)
+	chmod 755 $(DESTDIR)$(SCRIPT)
+	$(INSTALL) -d $(DESTDIR)$(DATAPATH)
+	$(INSTALL_SCRIPT) hatariui.py debugui.py $(DESTDIR)$(DATAPATH)/
+	$(INSTALL_DATA) config.py dialogs.py hatari.py uihelpers.py $(DESTDIR)$(DATAPATH)/
+	$(INSTALL_DATA) README TODO Changelog *.png $(DESTDIR)$(DATAPATH)/
+	$(INSTALL) -d $(DESTDIR)$(ICONPATH)
+	$(INSTALL_DATA) hatari-icon.png $(DESTDIR)$(ICONPATH)/
+	$(INSTALL) -d $(DESTDIR)$(DESKPATH)
+	$(INSTALL_DATA) hatariui.desktop $(DESTDIR)$(DESKPATH)/