[xiph-cvs] cvs commit: vorbis-tools/ogginfo Makefile.am

[Stan Seibert]

volsung     01/08/04 15:23:22

  Modified:    .        configure.in
               ogg123   Makefile.am
               oggenc/man Makefile.am
               ogginfo  Makefile.am
  Log:
  Fix so that manpages are consistently installed for each tool.

Revision  Changes    Path
1.24      +6 -1      vorbis-tools/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configure.in	2001/07/04 14:58:40	1.23
+++ configure.in	2001/08/04 22:23:21	1.24
@@ -74,7 +74,12 @@
 dnl Work around FHS stupidity
 dnl --------------------------------------------------
 
-AM_CONDITIONAL(PREFIX_IS_USR, test x$prefix = x"/usr")
+if test "$prefix" = "/usr"; then
+    MANDIR='$(datadir)/man'
+else
+    MANDIR='$(prefix)/man'
+fi
+AC_SUBST(MANDIR)
 
 dnl --------------------------------------------------
 dnl Do substitutions

1.15      +1 -1      vorbis-tools/ogg123/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.am	2001/03/25 15:59:31	1.14
+++ Makefile.am	2001/08/04 22:23:21	1.15
@@ -5,7 +5,7 @@
 bin_PROGRAMS = ogg123
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 doc_DATA = ogg123rc-example
-mandir = $(datadir)/man
+mandir = @MANDIR@
 man_MANS = ogg123.1
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@

1.4       +1 -6      vorbis-tools/oggenc/man/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/man/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2001/02/26 05:56:46	1.3
+++ Makefile.am	2001/08/04 22:23:21	1.4
@@ -2,12 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-if PREFIX_IS_USR
-mandir = $(datadir)/man
-else
-mandir = $(prefix)/man
-endif
-
+mandir = @MANDIR@
 man_MANS = oggenc.1
 
 EXTRA_DIST = $(man_MANS)

1.3       +1 -1      vorbis-tools/ogginfo/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogginfo/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/06/18 03:48:13	1.2
+++ Makefile.am	2001/08/04 22:23:22	1.3
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 bin_PROGRAMS = ogginfo
-mandir = $(datadir)/man
+mandir = @MANDIR@
 man_MANS = ogginfo.1
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.