[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ChangeLog Makefile.in configure configure...
|
From: |
Bernd Warken |
|
Subject: |
[Groff-commit] groff ChangeLog Makefile.in configure configure... |
|
Date: |
Tue, 30 Apr 2013 00:40:40 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Bernd Warken <bwarken> 13/04/30 00:40:40
Modified files:
. : ChangeLog Makefile.in configure configure.ac
contrib/glilypond: Makefile.sub glilypond.pl
m4 : groff.m4
src/roff/groff : Makefile.sub
Log message:
Makefile.in, m4/groff.m4: Add address@hidden@' and
`$libprogramdir' (usually `/usr/local/lib/groff'). Change
`$libdir/groff' into $libprogramdir for several `groff' programs.
Run `autoreconf -I m4'.
src/roff/groff/MAkefile.sub: Add $(DESTDIR) and $(srcdir) in
order to support installation outside of source code.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1419&r2=1.1420
http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/groff/configure?cvsroot=groff&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/groff/configure.ac?cvsroot=groff&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/glilypond.pl?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/m4/groff.m4?cvsroot=groff&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/Makefile.sub?cvsroot=groff&r1=1.11&r2=1.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1419
retrieving revision 1.1420
diff -u -b -r1.1419 -r1.1420
--- ChangeLog 29 Apr 2013 19:13:54 -0000 1.1419
+++ ChangeLog 30 Apr 2013 00:40:33 -0000 1.1420
@@ -1,3 +1,16 @@
+2013-04-30 Bernd Warken <address@hidden>
+
+ * Makefile.in, m4/groff.m4: Add address@hidden@' and
+ `$libprogramdir' (usually `/usr/local/lib/groff'). Change
+ `$libdir/groff' into $libprogramdir for several `groff' programs.
+ Run `autoreconf -I m4'.
+
+ * src/roff/groff/MAkefile.sub: Add $(DESTDIR) and $(srcdir) in
+ order to support installation outside of source code.
+
+ * contrib/glilypond/Makefile.sub, contrib/glilypond/glilypond.pl:
+ Correct the install directories.
+
2013-04-29 Bernd Warken <address@hidden>
* src/roff/groff/Makefile.sub: Replace some variables by shell
Index: Makefile.in
===================================================================
RCS file: /cvsroot/groff/groff/Makefile.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- Makefile.in 16 Apr 2013 19:00:45 -0000 1.130
+++ Makefile.in 30 Apr 2013 00:40:35 -0000 1.131
@@ -2,7 +2,7 @@
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
#
-# Last update: 28 Mar 2013
+# Last update: 30 Apr 2013
#
# This file is part of groff.
#
@@ -190,6 +190,7 @@
# gxditview.
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
Index: configure
===================================================================
RCS file: /cvsroot/groff/groff/configure,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- configure 26 Apr 2013 06:21:34 -0000 1.95
+++ configure 30 Apr 2013 00:40:36 -0000 1.96
@@ -744,7 +744,8 @@
PATH_SEPARATOR
SHELL
grog_dir
-glilypond_dir'
+glilypond_dir
+libprogramdir'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -5519,6 +5520,8 @@
fi
fi
+libprogramdir=$libdir/groff
+
# Check whether --with-grofferdir was given.
if test "${with_grofferdir+set}" = set; then :
@@ -5526,14 +5529,14 @@
fi
if test "x$with_grofferdir" = "x"; then
- groffer_dir=$libdir/groff/groffer
+ groffer_dir=$libprogramdir/groffer
else
groffer_dir=$with_grofferdir
fi
-glilypond_dir=$libdir/groff/glilypond
+glilypond_dir=$libprogramdir/glilypond
-grog_dir=$libdir/groff/grog
+grog_dir=$libprogramdir/grog
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not
truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
Index: configure.ac
===================================================================
RCS file: /cvsroot/groff/groff/configure.ac,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- configure.ac 14 Apr 2013 23:11:10 -0000 1.53
+++ configure.ac 30 Apr 2013 00:40:38 -0000 1.54
@@ -60,6 +60,7 @@
GROFF_X11
GROFF_APPRESDIR_OPTION
GROFF_APPRESDIR_DEFAULT
+GROFF_LIBPROGRAMDIR_DEFAULT
GROFF_GROFFERDIR_OPTION
GROFF_GROFFERDIR_DEFAULT
GROFF_GLILYPONDDIR_DEFAULT
Index: contrib/glilypond/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- contrib/glilypond/Makefile.sub 25 Apr 2013 22:37:58 -0000 1.5
+++ contrib/glilypond/Makefile.sub 30 Apr 2013 00:40:39 -0000 1.6
@@ -35,45 +35,47 @@
all: glilypond
-GLILYPOND=$(srcdir)/glilypond.pl \
- $(srcdir)/subs.pl \
+
+# files going to lib directory `$(glilypond_dir)'
+
+GLILYPOND_LIB=$(srcdir)/subs.pl \
$(srcdir)/oop_fh.pl \
$(srcdir)/args.pl
-GLILYPOND_=`echo $(GLILYPOND) | sed 's|$(srcdir)/||g'`
+GLILYPOND_LIB_=`echo $(GLILYPOND_LIB) | sed 's|$(srcdir)/||g'`
+
+
+# create perl executable `glilypond', being stored into `bindir'
-# TODO: Add perl check to configure script.
-glilypond: $(GLILYPOND)
+glilypond: $(srcdir)/glilypond.pl
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|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \
-e "s|@VERSION@|$(version)$(revision)|g" \
$(srcdir)/glilypond.pl >$@
chmod +x $@
-install_data: glilypond
- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install_data: glilypond $(GLILYPOND_LIB)
+ -test -d $(DESTDIR)$(bindir) \
+ || $(mkinstalldirs) $(DESTDIR)$(bindir)
$(RM) $(DESTDIR)$(bindir)/$<
$(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/$<
-test -d $(DESTDIR)$(glilypond_dir) \
|| $(mkinstalldirs) $(DESTDIR)$(glilypond_dir)
for f in $(GLILYPOND_); do \
$(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(glilypond_dir)/$$f;
\
done
- for f in $(GLILYPOND_); do \
- $(INSTALL_SCRIPT) $(srcdir)/$$f \
- $(DESTDIR)$(glilypond_dir)/$$f; \
- done
+
uninstall_sub:
$(RM) $(DESTDIR)$(bindir)/glilypond;
for f in $(GLILYPOND_); do \
$(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
done
- -test -d $(DESTDIR)$(libdir)/groff/glilypond \
- && -rmdir $(DESTDIR)$(libdir)/groff/glilypond
+ -rmdir $(DESTDIR)$(glilypond_dir)
########################################################################
# Emacs settings
Index: contrib/glilypond/glilypond.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/glilypond.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- contrib/glilypond/glilypond.pl 25 Apr 2013 00:21:14 -0000 1.5
+++ contrib/glilypond/glilypond.pl 30 Apr 2013 00:40:39 -0000 1.6
@@ -111,23 +111,16 @@
$Globals->{'before_make'} = TRUE if '@VERSION@' eq "${at}VERSION${at}";
}
- my %at_at;
my $file_test_pl;
my $glilypond_libdir;
if ( $Globals->{'before_make'} ) { # in source, not yet installed
my $glilypond_dir = $FindBin::Bin;
$glilypond_dir = Cwd::realpath($glilypond_dir);
- $at_at{'BINDIR'} = $glilypond_dir;
- $at_at{'G'} = '';
- $at_at{'LIBDIR'} = '';
$glilypond_libdir = $glilypond_dir;
} else { # already installed
$Globals->{'groff_version'} = '@VERSION@';
- $at_at{'BINDIR'} = '@BINDIR@';
- $at_at{'G'} = '@g@';
- $at_at{'LIBDIR'} = '@libdir@';
$glilypond_libdir = '@glilypond_dir@';
}
Index: m4/groff.m4
===================================================================
RCS file: /cvsroot/groff/groff/m4/groff.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- m4/groff.m4 16 Apr 2013 19:00:47 -0000 1.14
+++ m4/groff.m4 30 Apr 2013 00:40:39 -0000 1.15
@@ -1252,18 +1252,23 @@
AC_DEFUN([GROFF_GROFFERDIR_DEFAULT],
[if test "x$with_grofferdir" = "x"; then
- groffer_dir=$libdir/groff/groffer
+ groffer_dir=$libprogramdir/groffer
else
groffer_dir=$with_grofferdir
fi
AC_SUBST([groffer_dir])])
+AC_DEFUN([GROFF_LIBPROGRAMDIR_DEFAULT],
+ libprogramdir=$libdir/groff
+ AC_SUBST([libprogramdir]))
+
+
AC_DEFUN([GROFF_GLILYPONDDIR_DEFAULT],
- glilypond_dir=$libdir/groff/glilypond
+ glilypond_dir=$libprogramdir/glilypond
AC_SUBST([glilypond_dir]))
AC_DEFUN([GROFF_GROGDIR_DEFAULT],
- grog_dir=$libdir/groff/grog
+ grog_dir=$libprogramdir/grog
AC_SUBST([grog_dir]))
Index: src/roff/groff/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/Makefile.sub,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/roff/groff/Makefile.sub 29 Apr 2013 19:13:54 -0000 1.11
+++ src/roff/groff/Makefile.sub 30 Apr 2013 00:40:40 -0000 1.12
@@ -40,12 +40,11 @@
MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT)
RM=rm -f
-EGREP=egrep
.PHONY: all
-all: groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT)
+all: $(CCSRCS) groff_opts.tmp $(GROFF_OPTS_OUTPUT)
-groff_opts.tmp: groff.cpp
+groff_opts.tmp: $(CCSRCS)
@$(EGREP) -e ':.*:.*:' $< \
| sed -e 's/[ \t",]//g' > $@
@echo -n 'groff options: '