Fix broken symlink when NOMANCOMPRESS is defined.

Prompted by:	PR 129465 for x11-wm/fvwm2
This commit is contained in:
Cy Schubert 2008-12-13 06:35:51 +00:00
parent 5b7c6b6b6b
commit e99a993cce
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=224177
3 changed files with 7 additions and 12 deletions

View File

@ -131,7 +131,8 @@ MAN1+= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
FvwmPerl.1 fvwm-perllib.1 FvwmProxy.1 FvwmTabs.1 FvwmWindowMenu.1 \
FvwmGtkDebug.1
MLINKS= fvwm.1 fvwm2.1
MLINKS= fvwm.1 fvwm2.1 \
fvwm-root.1 xpmroot.1
.if !defined(WITHOUT_ICONS)
PLIST_SUB+= ICONS=""

View File

@ -1,15 +1,12 @@
--- bin/Makefile.in.orig Mon Dec 2 05:08:41 2002
+++ bin/Makefile.in Tue Dec 17 11:29:50 2002
@@ -592,9 +592,9 @@
echo "Minor warning: $(bindir)/xpmroot symlink was not created"
--- bin/Makefile.in.orig 2008-05-06 22:22:48.000000000 -0700
+++ bin/Makefile.in 2008-12-12 19:35:30.533121271 -0800
@@ -734,8 +734,7 @@
install-data-local:
- @rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1
@rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1
- @$(LN_S) fvwm-root.1 $(DESTDIR)$(mandir)/man1/xpmroot.1 || \
- echo "Minor warning: $(mandir)/man1/xpmroot.1 symlink was not created"
+ @rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1.gz
+ @$(LN_S) fvwm-root.1.gz $(DESTDIR)$(mandir)/man1/xpmroot.1.gz || \
+ echo "Minor warning: $(mandir)/man1/xpmroot.1.gz symlink was not created"
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -55,9 +55,6 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmTile
libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
libexec/fvwm/%%FVWM_VERSION%%/FvwmWindowMenu
@comment The following are here because they are symlinks
man/man1/xpmroot.1.gz
@comment End of symlink list
%%ICONS%%%%DATADIR%%/pixmaps/Jlock.xpm
%%ICONS%%%%DATADIR%%/pixmaps/Jnews.xpm
%%ICONS%%%%DATADIR%%/pixmaps/Jrecycle.xpm