Fix install and uninstall rules.

matlo · Oct 15, 2016 · 88621f1 · 88621f1
1 parent 95611b0
commit 88621f1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 18 deletions.
diff --git a/config/Makefile b/config/Makefile
@@ -51,11 +51,13 @@ install: all
 	cp gimx-$(NAME).png $(prefix)/share/pixmaps
 
 uninstall:
-	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
-	-$(RM) $(bindir)
-	-$(RM) $(prefix)
-	-$(RM) $(prefix)/share/applications/gimx-$(NAME).desktop
 	-$(RM) $(prefix)/share/pixmaps/gimx-$(NAME).png
+	-$(RM) $(prefix)/share/applications/gimx-$(NAME).desktop
+	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
+	-rmdir $(prefix)/share/pixmaps
+	-rmdir $(prefix)/share/applications
+	-rmdir $(bindir)
+	-rmdir $(prefix)
 
 really-clean: clean uninstall
 endif
diff --git a/core/Makefile b/core/Makefile
@@ -87,8 +87,8 @@ install: all
 
 uninstall:
 	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
-	-$(RM) $(bindir)
-	-$(RM) $(prefix)
+	-rmdir $(bindir)
+	-rmdir $(prefix)
 
 really-clean: clean uninstall
 endif
diff --git a/fpsconfig/Makefile b/fpsconfig/Makefile
@@ -51,11 +51,13 @@ install: all
 	cp gimx-$(NAME).png $(prefix)/share/pixmaps
 
 uninstall:
-	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
-	-$(RM) $(bindir)
-	-$(RM) $(prefix)
-	-$(RM) $(prefix)/share/applications/gimx-$(NAME).desktop
 	-$(RM) $(prefix)/share/pixmaps/gimx-$(NAME).png
+	-$(RM) $(prefix)/share/applications/gimx-$(NAME).desktop
+	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
+	-rmdir $(prefix)/share/pixmaps
+	-rmdir $(prefix)/share/applications
+	-rmdir $(bindir)
+	-rmdir $(prefix)
 
 really-clean: clean uninstall
 endif
diff --git a/launcher/Makefile b/launcher/Makefile
@@ -55,11 +55,13 @@ install: all
 	cp gimx-$(NAME).png $(prefix)/share/pixmaps
 
 uninstall:
-	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
-	-$(RM) $(bindir)
-	-$(RM) $(prefix)
-	-$(RM) $(prefix)/share/applications/gimx-$(NAME).desktop
 	-$(RM) $(prefix)/share/pixmaps/gimx-$(NAME).png
+	-$(RM) $(prefix)/share/applications/gimx-$(NAME).desktop
+	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
+	-rmdir $(prefix)/share/pixmaps
+	-rmdir $(prefix)/share/applications
+	-rmdir $(bindir)
+	-rmdir $(prefix)
 
 really-clean: clean uninstall
 endif
diff --git a/shared/Makedefs b/shared/Makedefs
@@ -28,13 +28,14 @@ clean:
 
 ifneq ($(OS),Windows_NT)
 install: all
+	mkdir -p $(prefix)
 	mkdir -p $(libdir)
 	cp $(LIBNAME)$(SHLIB_SUFFIX) $(libdir)
 
 uninstall:
 	-$(RM) $(libdir)/$(LIBNAME)$(SHLIB_SUFFIX)
-	-$(RM) $(libdir)
-	-$(RM) $(prefix)
+	-rmdir $(libdir)
+	-rmdir $(prefix)
 
 really-clean: clean uninstall
 endif
diff --git a/utils/Makefile b/utils/Makefile
@@ -45,8 +45,8 @@ install: all
 
 uninstall:
 	-for i in $(BINS); do $(RM) $(bindir)/$$i; done
-	-$(RM) $(bindir)
-	-$(RM) $(prefix)
+	-rmdir $(bindir)
+	-rmdir $(prefix)
 
 really-clean: clean uninstall
 endif