diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-13 09:38:52 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-13 09:38:52 +0000 |
| commit | ad29d028b2ff8135239a2b8e3812064b28a13009 (patch) | |
| tree | 4825e6c7f69560e3c496d87cf795972f7b259af9 | |
| parent | Move man pages from manm to mann. Fix the missing install autoconf bug in a (diff) | |
Don't install the pixmap when not using gnome, to fix the PLIST.
Notes
Notes:
svn path=/head/; revision=33768
| -rw-r--r-- | ftp/gftp/files/patch-ab | 25 | ||||
| -rw-r--r-- | ftp/gftp/pkg-plist | 2 |
2 files changed, 6 insertions, 21 deletions
diff --git a/ftp/gftp/files/patch-ab b/ftp/gftp/files/patch-ab index 1246f8b0f0fe..7dee68a5cdcf 100644 --- a/ftp/gftp/files/patch-ab +++ b/ftp/gftp/files/patch-ab @@ -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 = diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist index b2f62a214d41..c22a6c99cd1e 100644 --- a/ftp/gftp/pkg-plist +++ b/ftp/gftp/pkg-plist @@ -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 |