--- data/bluefish.desktop.in.orig 2005-09-28 04:07:14.489265032 +0200 +++ data/bluefish.desktop.in 2005-09-28 04:07:20.634330840 +0200 @@ -4,7 +4,7 @@ Comment=Web Development Editor Comment[de]=Editor für Web-Entwickler Exec=bluefish %F -Icon=ICONDIR/bluefish-icon.png +Icon=bluefish-icon.png Terminal=false Type=Application Categories=GTK;GNOME;Application;Development;WebDevelopment; --- Makefile.in.orig 2004-12-28 15:54:15.000000000 +0100 +++ Makefile.in 2005-09-28 04:22:39.378660472 +0200 @@ -25,7 +25,7 @@ srcdir = src -prefix=@prefix@ +prefix=$(DESTDIR)/@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ datadir=@datadir@ @@ -35,7 +35,7 @@ INSTALLMAIN=@INSTALLMAIN@ MAKEMAIN=@MAKEMAIN@ -iconpath=@ICONPATH@ +iconpath=$(DESTDIR)/@ICONPATH@ INSTALL = @INSTALL@ INSTALL_DIR = $(INSTALL) -d -m 755 @@ -52,7 +52,6 @@ @cd data/ && $(MAKE) all make-nls: - cd po/ && $(MAKE) all; clean: rm -f core *~ @@ -73,16 +72,15 @@ rm -f *.orig *.rej install-icon: - $(INSTALL_DIR) $(DESTDIR)$(iconpath) - $(INSTALL_DATA) inline_images/bluefish_icon1.png $(DESTDIR)$(iconpath)/bluefish-icon.png + $(INSTALL_DIR) $(iconpath) + $(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png install-nls: - cd po/ && $(MAKE) install install: src/bluefish ${INSTALLMAIN} pkgdatadir=@pkgdatadir@ - $(INSTALL_DIR) $(DESTDIR)$(pkgdatadir) - $(INSTALL_DATA) images/bluefish_splash.png $(DESTDIR)$(pkgdatadir) + $(INSTALL_DIR) $(pkgdatadir) + $(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir) @cd icons/ && $(MAKE) install @cd src/ && $(MAKE) install @cd data/ && $(MAKE) install --- data/Makefile.in.orig 2005-09-28 03:42:45.621566864 +0200 +++ data/Makefile.in 2005-09-28 03:42:54.221259512 +0200 @@ -65,7 +65,6 @@ $(INSTALL_DATA) bluefish.xml $(DESTDIR)$(FDMIME)/packages install-update-mime: - $(UPDATE_MIME) $(FDMIME) install-gnome-2.4-mime: $(INSTALL_DIR) $(DESTDIR)$(GMIMEINFO)