Don't install the pixmap when not using gnome, to fix the PLIST.

This commit is contained in:
Jeremy Lea 2000-10-13 09:38:52 +00:00
parent 7fbb0db06e
commit ad29d028b2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=33768
2 changed files with 6 additions and 21 deletions

View File

@ -1,31 +1,16 @@
--- docs/Makefile.in.orig Sun Aug 6 19:53:16 2000
+++ docs/Makefile.in Fri Sep 8 02:09:07 2000
@@ -91,8 +91,10 @@
@@ -91,11 +91,13 @@
SUBDIRS = sample.gftp
EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png
+.ifdef HAVE_GNOME
Utilitiesdir = $(datadir)/apps/Internet
Utilities_DATA = gftp.desktop
+.endif
Iconsdir = $(datadir)/pixmaps
Icons_DATA = gftp.png
@@ -182,7 +184,6 @@
install-UtilitiesDATA: $(Utilities_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(Utilitiesdir)
@list='$(Utilities_DATA)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Utilitiesdir)/$$p"; \
@@ -338,8 +339,7 @@
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Iconsdir) \
- $(DESTDIR)$(Utilitiesdir)
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Iconsdir)
mostlyclean-generic:
+.endif
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =

View File

@ -20,7 +20,7 @@ bin/gftp
%%DATADIR%%/gftp/tar.xpm
%%DATADIR%%/gftp/txt.xpm
%%DATADIR%%/gftp/world.xpm
%%DATADIR%%/pixmaps/gftp.png
%%GNOME:%%share/gnome/pixmaps/gftp.png
share/locale/br/LC_MESSAGES/gftp.mo
share/locale/cs/LC_MESSAGES/gftp.mo
share/locale/da/LC_MESSAGES/gftp.mo