[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff/contrib/groffer ChangeLog Makefile.sub pe...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff/contrib/groffer ChangeLog Makefile.sub pe... |
|
Date: |
Mon, 23 Oct 2006 09:42:24 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Werner LEMBERG <wl> 06/10/23 09:42:24
Modified files:
contrib/groffer: ChangeLog Makefile.sub
Added files:
contrib/groffer/perl: perl_test.pl
Removed files:
contrib/groffer: perl_test.pl
Log message:
* perl_test.pl: Moved to...
* perl/perl_test.pl: Here.
* Makefile.sub: Rewritten.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/ChangeLog?cvsroot=groff&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/Makefile.sub?cvsroot=groff&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/perl_test.pl?cvsroot=groff&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/perl/perl_test.pl?cvsroot=groff&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ChangeLog 14 Oct 2006 13:45:32 -0000 1.47
+++ ChangeLog 23 Oct 2006 09:42:24 -0000 1.48
@@ -1,3 +1,10 @@
+2006-10-23 Werner Lemberg
+
+ * perl_test.pl: Moved to...
+ * perl/perl_test.pl: Here.
+
+ * Makefile.sub: Rewritten.
+
2006-10-14 Bernd Warken
________________________________________________________________
* release of groffer 1.0.1
Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/Makefile.sub,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- Makefile.sub 14 Oct 2006 05:59:54 -0000 1.20
+++ Makefile.sub 23 Oct 2006 09:42:24 -0000 1.21
@@ -5,7 +5,7 @@
# Copyright (C) 2001,2002,2005,2006 Free Software Foundation, Inc.
# Written by Werner Lemberg <address@hidden> and Bernd Warken.
-# Last update: 11 Oct 2006
+# Last update: 23 Oct 2006
# This file is part of `groffer' which is part of `groff'.
@@ -27,26 +27,36 @@
########################################################################
MAN1=groffer.n
-CLEANADD=groffer PERL SHELL groffer.man groffer.n
+CLEANADD=groffer HAVE_PERL HAVE_SHELL groffer.man groffer.n
# not all make programs have $(RM) predefined.
RM=rm -f
all: groffer
-GROFFER_TOP=perl_test.pl version.sh
-GROFFER_PERL=perl/groffer.pl perl/split_env.sh perl/func.pl perl/man.pl \
-perl/groffer.man
-GROFFER_SHELL=shell/groffer.sh shell/groffer2.sh shell/groffer.man
-
-groffer: $(GROFFER_TOP) $(GROFFER_PERL) $(GROFFER_SHELL) $(SH_DEPS_SED_SCRIPT)
- address@hidden(RM) $@
- address@hidden(RM) groffer.man groffer.n
- address@hidden(RM) PERL SHELL
- address@hidden a+x perl/groffer.pl shell/groffer.sh
- if perl perl_test.pl 2>&1 >/dev/null; then \
- : >PERL; \
- echo "Use groffer Perl version."; \
+GROFFER_PERL=$(srcdir)/perl/func.pl \
+ $(srcdir)/perl/man.pl \
+ $(srcdir)/perl/perl_test.pl \
+ $(srcdir)/perl/split_env.sh
+GROFFER_SHELL=$(srcdir)/shell/groffer2.sh
+GROFFER_REST=$(srcdir)/version.sh \
+ $(srcdir)/perl/groffer.man \
+ $(srcdir)/perl/groffer.pl \
+ $(srcdir)/shell/groffer.man \
+ $(srcdir)/shell/groffer.sh
+
+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
+
+# TODO: Add perl check to configure script.
+groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \
+ $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
+ $(RM) $(CLEANADD)
+ if perl $(srcdir)/perl/perl_test.pl 2>&1 >/dev/null; then \
+ : >HAVE_PERL; \
+ echo "Using perl version of groffer."; \
sed -f "$(SH_DEPS_SED_SCRIPT)" \
-e "s|@g@|$(g)|g" \
-e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
@@ -54,10 +64,10 @@
-e "s|@VERSION@|$(version)$(revision)|g" \
-e "$(SH_SCRIPT_SED_CMD)" \
$(srcdir)/perl/groffer.pl >$@; \
- cp perl/groffer.man groffer.man; \
+ cp $(srcdir)/perl/groffer.man groffer.man; \
else \
- : >SHELL; \
- echo "Use groffer shell version."; \
+ : >HAVE_SHELL; \
+ echo "Using shell version of groffer."; \
sed -f "$(SH_DEPS_SED_SCRIPT)" \
-e "s|@g@|$(g)|g" \
-e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
@@ -65,46 +75,39 @@
-e "s|@VERSION@|$(version)$(revision)|g" \
-e "$(SH_SCRIPT_SED_CMD)" \
$(srcdir)/shell/groffer.sh >$@; \
- cp shell/groffer.man groffer.man; \
+ cp $(srcdir)/shell/groffer.man groffer.man; \
fi
- chmod a+x $@
+ chmod +x $@
install_data: groffer
- address@hidden -d $(DESTDIR)$(bindir) || $(mkinstalldirs)
$(DESTDIR)$(bindir)
- address@hidden -d $(DESTDIR)$(libdir)/groff/groffer || \
- $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/groffer
- address@hidden(RM) $(DESTDIR)$(bindir)/groffer
- address@hidden(RM) $(DESTDIR)$(libdir)/groff/groffer/func.sh
- address@hidden(RM) $(DESTDIR)$(libdir)/groff/groffer/man.sh
- address@hidden(RM) $(DESTDIR)$(libdir)/groff/groffer/split_env.sh
- address@hidden(RM) $(DESTDIR)$(libdir)/groff/groffer/perl_test.pl
- address@hidden(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
- address@hidden(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh
+ -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+ $(RM) $(DESTDIR)$(bindir)/groffer
$(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
+ -test -d $(DESTDIR)$(groffer_dir) \
+ || $(mkinstalldirs) $(DESTDIR)$(groffer_dir)
+ $(RM) $(DESTDIR)$(groffer_lib)/version.sh
$(INSTALL_DATA) $(srcdir)/version.sh \
- $(DESTDIR)$(libdir)/groff/groffer/version.sh; \
- if test -f PERL; then \
- $(INSTALL_SCRIPT) $(srcdir)/perl_test.pl \
- $(DESTDIR)$(libdir)/groff/groffer/perl_test.pl; \
- $(INSTALL_SCRIPT) $(srcdir)/perl/split_env.sh \
- $(DESTDIR)$(libdir)/groff/groffer/split_env.sh; \
- $(INSTALL_SCRIPT) $(srcdir)/perl/func.pl \
- $(DESTDIR)$(libdir)/groff/groffer/func.pl; \
- $(INSTALL_SCRIPT) $(srcdir)/perl/man.pl \
- $(DESTDIR)$(libdir)/groff/groffer/man.pl; \
- elif test -f SHELL; then \
- $(INSTALL_SCRIPT) $(srcdir)/shell/groffer2.sh \
- $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh; \
+ $(DESTDIR)$(groffer_dir)/version.sh
+ for f in $(GROFFER_PERL_) $(GROFFER_SHELL_); do \
+ $(RM) $(DESTDIR)$(groffer_dir)/$$f; \
+ done
+ if test -f HAVE_PERL; then \
+ for f in $(GROFFER_PERL_); do \
+ $(INSTALL_SCRIPT) $(srcdir)/perl/$$f \
+ $(DESTDIR)$(groffer_dir)/$$f; \
+ done; \
+ elif test -f HAVE_SHELL; then \
+ for f in $(GROFFER_SHELL_); do \
+ $(INSTALL_SCRIPT) $(srcdir)/shell/$$f \
+ $(DESTDIR)$(groffer_dir)/$$f; \
+ done; \
fi;
uninstall_sub:
- -$(RM) $(DESTDIR)$(bindir)/groffer
- -$(RM) $(DESTDIR)$(libdir)/groff/groffer/func.sh
- -$(RM) $(DESTDIR)$(libdir)/groff/groffer/man.sh
- -$(RM) $(DESTDIR)$(libdir)/groff/groffer/split_env.sh
- -$(RM) $(DESTDIR)$(libdir)/groff/groffer/perl_test.pl
- -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
- -$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh
+ $(RM) $(DESTDIR)$(bindir)/groffer
+ for f in $(GROFFER_PERL_) $(GROFFER_SHELL_); do \
+ $(RM) $(DESTDIR)$(groffer_dir)/$$f; \
+ done
-rmdir $(DESTDIR)$(libdir)/groff/groffer
########################################################################
Index: perl/perl_test.pl
===================================================================
RCS file: perl/perl_test.pl
diff -N perl/perl_test.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ perl/perl_test.pl 23 Oct 2006 09:42:24 -0000 1.1
@@ -0,0 +1,37 @@
+#! /usr/bin/env perl
+
+# groffer - display groff files
+
+# Source file position: <groff-source>/contrib/groffer/perl/perl_test.sh
+# Installed position: <prefix>/lib/groff/groffer/perl_test.sh
+
+# Copyright (C) 2006 Free Software Foundation, Inc.
+# Written by Bernd Warken.
+
+# Last update: 02 Sep 2006
+
+# This file is part of `groffer', which is part of `groff'.
+
+# `groff' is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# `groff' is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with `groff'; see the files COPYING and LICENSE in the top
+# directory of the `groff' source. If not, write to the Free Software
+# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+########################################################################
+
+# This file tests whether perl has a suitable version. It is used by
+# groffer.pl and Makefile.sub.
+
+# require 5.004_05;
+require v5.6.1;
Index: perl_test.pl
===================================================================
RCS file: perl_test.pl
diff -N perl_test.pl
--- perl_test.pl 14 Oct 2006 05:59:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-#! /usr/bin/env perl
-
-# groffer - display groff files
-
-# Source file position: <groff-source>/contrib/groffer/perl/perl_test.sh
-# Installed position: <prefix>/lib/groff/groffer/perl_test.sh
-
-# Copyright (C) 2006 Free Software Foundation, Inc.
-# Written by Bernd Warken.
-
-# Last update: 02 Sep 2006
-
-# This file is part of `groffer', which is part of `groff'.
-
-# `groff' is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# `groff' is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source. If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
-
-########################################################################
-
-# This file tests whether perl has a suitable version. It is used by
-# groffer.pl and Makefile.sub.
-
-# require 5.004_05;
-require v5.6.1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff/contrib/groffer ChangeLog Makefile.sub pe...,
Werner LEMBERG <=