Fix up the groff related stuff for man pages to be done in the correct place

We should be doing the linking for the groff stuff in upd-instroot as it
isn't relevant for the initrds

2 files changed, 7 insertions, 8 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index 2356bd3ae..fabbaf808 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -578,14 +578,6 @@ makeinitrd() {
     mkdir -p $MBD_DIR/var/lib
     ln -s ../../tmp $MBD_DIR/var/lib/xkb
 
-
-    #
-    # This seems a good place for this.  Lets create the links to what should be the manpage stuff.
-    #
-    for file in "nroff groff iconv geqn gtbl gpic gefer" ; do
-        ln -s /mnt/sysimage/usr/bin/$file $MBD_DIR/usr/bin/$file
-    done
-
     # s390/s390x need sshd setup
     if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
 	setupShellEnvironment
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index d3ab88bea..a61c2d7d2 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -946,6 +946,13 @@ if [ -n "$NEEDGR" -a -d "$DESTDIR"/etc/joe ]; then
     ln -fs jpico $DESTGR/usr/bin/nano
 fi
 
+# fix up some links for man page related stuff
+for p in $DEST $DESTGR; do
+    for file in nroff groff iconv geqn gtbl gpic grefer ; do
+        ln -fs /mnt/sysimage/usr/bin/$file $p/usr/bin/$file
+    done
+done
+
 # create selinux config
 if [ -e $DEST/etc/selinux/targeted ]; then
   cat > $DEST/etc/selinux/config <<EOF