diff --git a/app/src/gambas3/install/Makefile.am b/app/src/gambas3/install/Makefile.am
index 5238446ce..194592f47 100644
--- a/app/src/gambas3/install/Makefile.am
+++ b/app/src/gambas3/install/Makefile.am
@@ -14,24 +14,24 @@ install-exec-local:
 	@(cd $(srcdir)/$(PACKAGE); \
 	if test "$(COMPONENT_build)" = "1"; then \
 	 echo "Installing $(PACKAGE).gambas in $(GBLIBRARY_path)"; \
-	 $(INSTALL) -d $(DESTDIR)$(prefix)/$(GBLIBRARY_path); \
-	 $(INSTALL) $(PACKAGE).gambas $(DESTDIR)$(prefix)/$(GBLIBRARY_path); \
+	 $(INSTALL) -d $(DESTDIR)/$(GBLIBRARY_path); \
+	 $(INSTALL) $(PACKAGE).gambas $(DESTDIR)/$(GBLIBRARY_path); \
 	 echo "Installing $(PACKAGE).component in $(GBLIBRARY_path)"; \
-	 $(INSTALL) -d $(DESTDIR)$(prefix)/$(GBLIBRARY_path); \
-	 $(INSTALL) .component $(DESTDIR)$(prefix)/$(GBLIBRARY_path)/$(PACKAGE).component; \
-	 chmod a-x $(DESTDIR)$(prefix)/$(GBLIBRARY_path)/$(PACKAGE).component; \
+	 $(INSTALL) -d $(DESTDIR)/$(GBLIBRARY_path); \
+	 $(INSTALL) .component $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
+	 chmod a-x $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
 	 echo "Installing $(PACKAGE).info in $(GBINFO_path)"; \
-	 $(INSTALL) -d .info $(DESTDIR)$(prefix)/$(GBINFO_path); \
-	 $(INSTALL) .info $(DESTDIR)$(prefix)/$(GBINFO_path)/$(PACKAGE).info; \
-	 chmod a-x $(DESTDIR)$(prefix)/$(GBINFO_path)/$(PACKAGE).info; \
+	 $(INSTALL) -d .info $(DESTDIR)/$(GBINFO_path); \
+	 $(INSTALL) .info $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
+	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
 	 echo "Installing $(PACKAGE).list in $(GBINFO_path)"; \
-	 $(INSTALL) .list $(DESTDIR)$(prefix)/$(GBINFO_path)/$(PACKAGE).list; \
-	 chmod a-x $(DESTDIR)$(prefix)/$(GBINFO_path)/$(PACKAGE).list; \
+	 $(INSTALL) .list $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
+	 chmod a-x $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
 	 if test -d .hidden/control; then \
 	  echo "Installing controls in $(GBCONTROL_path)"; \
-	  $(INSTALL) -d $(DESTDIR)$(prefix)/$(GBCONTROL_path)/$(PACKAGE); \
-	  $(INSTALL) .hidden/control/*.png $(DESTDIR)$(prefix)/$(GBCONTROL_path)/$(PACKAGE); \
-	  chmod a-x $(DESTDIR)$(prefix)/$(GBCONTROL_path)/$(PACKAGE)/*.png; \
+	  $(INSTALL) -d $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
+	  $(INSTALL) .hidden/control/*.png $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
+	  chmod a-x $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE)/*.png; \
 	 fi \
 	else \
 	 echo "Installing $(PACKAGE).gambas file in $(bindir)..."; \
@@ -42,11 +42,11 @@ install-exec-local:
 uninstall-local:
 	@(if test "$(COMPONENT_build)" = "1"; then \
 	 echo "Removing $(PACKAGE) component..."; \
-	 rm -f $(DESTDIR)$(prefix)/$(GBLIBRARY_path)/$(PACKAGE).gambas; \
-	 rm -f $(DESTDIR)$(prefix)/$(GBLIBRARY_path)/$(PACKAGE).component; \
-	 rm -f $(DESTDIR)$(prefix)/$(GBINFO_path)/$(PACKAGE).info; \
-	 rm -f $(DESTDIR)$(prefix)/$(GBINFO_path)/$(PACKAGE).list; \
-	 rm -rf $(DESTDIR)$(prefix)/$(GBCONTROL_path)/$(PACKAGE); \
+	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).gambas; \
+	 rm -f $(DESTDIR)/$(GBLIBRARY_path)/$(PACKAGE).component; \
+	 rm -f $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).info; \
+	 rm -f $(DESTDIR)/$(GBINFO_path)/$(PACKAGE).list; \
+	 rm -rf $(DESTDIR)/$(GBCONTROL_path)/$(PACKAGE); \
 	else \
 	 echo "Removing $(PACKAGE).gambas file..." \
 	 rm $(DESTDIR)$(bindir)/$(PACKAGE).gambas; \