e090aff5a2
* use new groff_1.21-6.debian.diff * refresh libexecdir and pdfroff patch - fix FATE#311297: Get rid of SuSEconfig.groff * removed OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=19
64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
Index: groff-1.21/contrib/groffer/Makefile.sub
|
|
===================================================================
|
|
--- groff-1.21.orig/contrib/groffer/Makefile.sub 2010-12-31 08:33:09.000000000 +0100
|
|
+++ groff-1.21/contrib/groffer/Makefile.sub 2011-06-27 13:10:49.646150367 +0200
|
|
@@ -63,7 +63,7 @@
|
|
GROFFER_PERL_=`echo $(GROFFER_PERL) | sed 's|$(srcdir)/perl/||g'`
|
|
GROFFER_SHELL_=`echo $(GROFFER_SHELL) | sed 's|$(srcdir)/shell||g'`
|
|
|
|
-groffer_dir=$(libdir)/groff/groffer
|
|
+groffer_dir=$(libexecdir)/groff/groffer
|
|
|
|
# TODO: Add perl check to configure script.
|
|
groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \
|
|
@@ -74,7 +74,7 @@
|
|
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|@libdir@|$(DESTDIR)$(libexecdir)|g" \
|
|
-e "s|@VERSION@|$(version)$(revision)|g" \
|
|
-e "$(SH_SCRIPT_SED_CMD)" \
|
|
$(srcdir)/perl/groffer.pl >$@; \
|
|
@@ -88,7 +88,7 @@
|
|
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|@libdir@|$(DESTDIR)$(libexecdir)|g" \
|
|
-e "s|@VERSION@|$(version)$(revision)|g" \
|
|
-e "$(SH_SCRIPT_SED_CMD)" \
|
|
$(srcdir)/shell/groffer.sh >$@; \
|
|
@@ -137,7 +137,7 @@
|
|
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.21/Makefile.in
|
|
===================================================================
|
|
--- groff-1.21.orig/Makefile.in 2011-06-27 13:10:49.595148562 +0200
|
|
+++ groff-1.21/Makefile.in 2011-06-27 13:10:49.647150402 +0200
|
|
@@ -139,6 +139,9 @@
|
|
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@
|
|
@@ -786,7 +789,7 @@
|
|
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)
|