--- gimp-2.0pre3/data/misc/Makefile.am.buildroot	2004-02-03 22:53:10.000000000 +0100
+++ gimp-2.0pre3/data/misc/Makefile.am	2004-02-06 14:45:08.365249703 +0100
@@ -28,18 +28,18 @@
 
 install-data-local:
 if DESKTOP_DATADIR
-	if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \
-		cd $(DESTDIR)@DESKTOP_DATADIR@/applications \
+	if test -d $(DESTDIR)$(DESKTOP_DATADIR)/applications; then \
+		cd $(DESTDIR)$(DESKTOP_DATADIR)/applications \
 		&& rm -f gimp-@GIMP_APP_VERSION@.desktop \
 		&& $(LN_S) $(miscdatadir)/gimp.desktop gimp-@GIMP_APP_VERSION@.desktop \
 	; fi
-	if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \
-		cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \
+	if test -d $(DESTDIR)$(DESKTOP_DATADIR)/application-registry; then \
+		cd $(DESTDIR)$(DESKTOP_DATADIR)/application-registry \
 		&& rm -f gimp-@GIMP_APP_VERSION@.applications \
 		&& $(LN_S) $(miscdatadir)/gimp.applications gimp-@GIMP_APP_VERSION@.applications \
 	; fi
-	if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \
-		cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \
+	if test -d $(DESTDIR)$(DESKTOP_DATADIR)/mime-info; then \
+		cd $(DESTDIR)$(DESKTOP_DATADIR)/mime-info \
 		&& rm -f gimp-@GIMP_APP_VERSION@.keys \
 		&& $(LN_S) $(miscdatadir)/gimp.keys gimp-@GIMP_APP_VERSION@.keys \
 	; fi
@@ -47,16 +47,16 @@
 
 uninstall-local:
 if DESKTOP_DATADIR
-	if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \
-		cd $(DESTDIR)@DESKTOP_DATADIR@/applications \
+	if test -d $(DESTDIR)$(DESKTOP_DATADIR)/applications; then \
+		cd $(DESTDIR)$(DESKTOP_DATADIR)/applications \
 		&& rm -f gimp-@GIMP_APP_VERSION@.desktop \
 	; fi
-	if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \
-		cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \
+	if test -d $(DESTDIR)$(DESKTOP_DATADIR)/application-registry; then \
+		cd $(DESTDIR)$(DESKTOP_DATADIR)/application-registry \
 		&& rm -f gimp-@GIMP_APP_VERSION@.applications \
 	; fi
-	if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \
-		cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \
+	if test -d $(DESTDIR)$(DESKTOP_DATADIR)/mime-info; then \
+		cd $(DESTDIR)$(DESKTOP_DATADIR)/mime-info \
 		&& rm -f gimp-@GIMP_APP_VERSION@.keys \
 	; fi
 endif