46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
Index: groff-1.22.2/contrib/groffer/Makefile.sub
|
|
===================================================================
|
|
--- groff-1.22.2.orig/contrib/groffer/Makefile.sub
|
|
+++ groff-1.22.2/contrib/groffer/Makefile.sub
|
|
@@ -73,7 +73,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL
|
|
sed -f "$(SH_DEPS_SED_SCRIPT)" \
|
|
-e "s|@g@|$(g)|g" \
|
|
-e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
|
|
- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
|
|
+ -e "s|@libexecdir@|$(DESTDIR)$(libexecdir)|g" \
|
|
-e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
|
|
-e "s|@VERSION@|$(version)$(revision)|g" \
|
|
-e "$(SH_SCRIPT_SED_CMD)" \
|
|
@@ -138,7 +138,7 @@ uninstall_sub:
|
|
for f in $(GROFFER_PERL_) $(GROFFER_SHELL_) version.sh; do \
|
|
$(RM) $(DESTDIR)$(groffer_dir)/$$f; \
|
|
done
|
|
- -rmdir $(DESTDIR)$(libdir)/groff/groffer
|
|
+ -rmdir $(DESTDIR)$(libexecdir)/groff/groffer
|
|
|
|
########################################################################
|
|
# Emacs settings
|
|
Index: groff-1.22.2/Makefile.in
|
|
===================================================================
|
|
--- groff-1.22.2.orig/Makefile.in
|
|
+++ groff-1.22.2/Makefile.in
|
|
@@ -139,6 +139,9 @@ bindir=@bindir@
|
|
libdir=@libdir@
|
|
libprogramdir=$(libdir)/groff
|
|
|
|
+# `libexecdir` says where to install script not intended to run as user
|
|
+libexecdir=@libexecdir@
|
|
+
|
|
# `datasubdir' says where to install platform-independent data files.
|
|
datadir=@datadir@
|
|
datarootdir=@datarootdir@
|
|
@@ -811,7 +814,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS):
|
|
fi; \
|
|
test -d $@ || $(mkinstalldirs) $@; \
|
|
cd $@; \
|
|
- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
|
|
+ $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir libexecdir=$(libexecdir) VPATH=$$srcdir \
|
|
-f $(top_srcdir)/Makefile.comm \
|
|
-f $$srcdir/Makefile.sub \
|
|
-f $(top_srcdir)/Makefile.man $(do)
|