various cleanups, reduce dependencies

automake die die die!
This commit is contained in:
naddy 2001-07-17 15:23:35 +00:00
parent f21e64469c
commit b7540d04df
23 changed files with 172 additions and 255 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2001/06/30 13:16:40 naddy Exp $
# $OpenBSD: Makefile,v 1.8 2001/07/17 15:23:35 naddy Exp $
COMMENT= "portable audio output library"
DISTNAME= libao-0.7.0
@ -37,16 +37,9 @@ LIB_DEPENDS+= esd.2::audio/esound
.endif
BUILD_DEPENDS= automake::devel/automake
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
MAKE_FLAGS= PLUGINS='${PLUGINS}'
FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST}
post-patch:
@cd ${WRKSRC} && \
touch aclocal.m4 configure.in && \
automake -i
.include <bsd.port.mk>

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-configure,v 1.1 2001/07/17 15:23:35 naddy Exp $
--- configure.orig Tue Jul 17 16:15:46 2001
+++ configure Tue Jul 17 16:16:18 2001
@@ -1510,7 +1510,7 @@ if test -z "$GCC"; then
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
DEBUG="-g"
- CFLAGS="-O"
+ CFLAGS=""
PROFILE="-g -p" ;;
esac
else
@@ -1525,9 +1525,9 @@ else
CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
*)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+ DEBUG="-g -Wall -fsigned-char"
+ CFLAGS="-fsigned-char"
+ PROFILE="-g -pg -fsigned-char" ;;
esac
fi
CFLAGS="$CFLAGS $cflags_save"

View File

@ -1,29 +0,0 @@
$OpenBSD: patch-configure_in,v 1.3 2001/06/30 13:16:41 naddy Exp $
--- configure.in.orig Mon Jun 18 03:02:46 2001
+++ configure.in Sat Jun 30 13:16:26 2001
@@ -45,9 +45,9 @@ if test -z "$GCC"; then
CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
- DEBUG="-g"
- CFLAGS="-O"
- PROFILE="-g -p" ;;
+ DEBUG="$CFLAGS -g"
+ CFLAGS="$CFLAGS"
+ PROFILE="$CFLAGS -g -p" ;;
esac
else
@@ -61,9 +61,9 @@ else
CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
*)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+ DEBUG="$CFLAGS -g -Wall -fsigned-char"
+ CFLAGS="$CFLAGS -fsigned-char"
+ PROFILE="$CFLAGS -g -pg -fsigned-char" ;;
esac
fi
CFLAGS="$CFLAGS $cflags_save"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_Makefile_am,v 1.1.1.1 2001/03/14 01:54:09 todd Exp $
--- doc/Makefile.am.orig Tue Mar 13 23:29:50 2001
+++ doc/Makefile.am Tue Mar 13 23:29:56 2001
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
doc_DATA = API USAGE DRIVERS WANTED

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2001/07/17 15:23:36 naddy Exp $
--- doc/Makefile.in.orig Tue Jul 17 16:31:38 2001
+++ doc/Makefile.in Tue Jul 17 16:32:01 2001
@@ -87,7 +87,7 @@ plugindir = @plugindir@
AUTOMAKE_OPTIONS = foreign
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
doc_DATA = API USAGE DRIVERS WANTED

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_Makefile_am,v 1.2 2001/06/30 13:16:42 naddy Exp $
--- src/Makefile.am.orig Sun May 13 05:30:40 2001
+++ src/Makefile.am Sat Jun 30 13:16:26 2001
@@ -10,6 +10,7 @@ lib_LTLIBRARIES = libao.la
libao_la_SOURCES = audio_out.c ao_au.c ao_raw.c ao_wav.c ao_null.c
libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+CFLAGS = @CFLAGS@ -DSHARED_LIB_EXT=\".so.@LIB_CURRENT@.@LIB_REVISION@\"
debug:
$(MAKE) all CFLAGS="@DEBUG@"

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2001/07/17 15:23:36 naddy Exp $
--- src/Makefile.in.orig Tue Jul 17 16:33:21 2001
+++ src/Makefile.in Tue Jul 17 16:33:36 2001
@@ -105,7 +105,7 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
libao_la_LIBADD =
libao_la_OBJECTS = audio_out.lo ao_au.lo ao_raw.lo ao_wav.lo ao_null.lo
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -DSHARED_LIB_EXT=\".so.@LIB_CURRENT@.@LIB_REVISION@\"
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)

View File

@ -1,10 +0,0 @@
$OpenBSD: patch-src_plugins_Makefile_am,v 1.3 2001/06/30 13:16:42 naddy Exp $
--- src/plugins/Makefile.am.orig Sat Dec 30 06:03:25 2000
+++ src/plugins/Makefile.am Thu Mar 15 16:53:07 2001
@@ -1,4 +1,5 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = oss sun esd alsa arts # irix
+PLUGINS = oss sun esd alsa arts # irix
+SUBDIRS = $(PLUGINS)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_plugins_Makefile_in,v 1.1 2001/07/17 15:23:36 naddy Exp $
--- src/plugins/Makefile.in.orig Tue Jul 17 16:36:07 2001
+++ src/plugins/Makefile.in Tue Jul 17 16:36:39 2001
@@ -86,7 +86,7 @@ VERSION = @VERSION@
plugindir = @plugindir@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = oss sun esd alsa arts # irix
+SUBDIRS = $(PLUGINS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
DIST_COMMON = Makefile.am Makefile.in

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_plugins_arts_Makefile_am,v 1.2 2001/04/10 22:56:20 naddy Exp $
--- src/plugins/arts/Makefile.am.orig Sat Dec 30 06:03:25 2000
+++ src/plugins/arts/Makefile.am Wed Apr 11 00:40:35 2001
@@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign
if HAVE_ARTS
artsltlibs = libarts.la
-artsldflags = -export-dynamic -avoid-version
+artsldflags = -export-dynamic \
+ -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
artssources = ao_arts.c
else
@@ -16,13 +17,12 @@ artssources =
endif
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@
libdir = $(plugindir)
lib_LTLIBRARIES = $(artsltlibs)
libarts_la_LDFLAGS = $(artsldflags)
-CFLAGS = @ARTS_CFLAGS@
libarts_la_LIBADD = @ARTS_LIBS@
libarts_la_SOURCES = $(artssources)

View File

@ -0,0 +1,32 @@
$OpenBSD: patch-src_plugins_arts_Makefile_in,v 1.1 2001/07/17 15:23:36 naddy Exp $
--- src/plugins/arts/Makefile.in.orig Tue Jul 17 16:37:00 2001
+++ src/plugins/arts/Makefile.in Tue Jul 17 16:39:44 2001
@@ -88,18 +88,17 @@ AUTOMAKE_OPTIONS = foreign
@HAVE_ARTS_TRUE@artsltlibs = libarts.la
@HAVE_ARTS_FALSE@artsltlibs =
-@HAVE_ARTS_TRUE@artsldflags = -export-dynamic -avoid-version
+@HAVE_ARTS_TRUE@artsldflags = -export-dynamic -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
@HAVE_ARTS_FALSE@artsldflags =
@HAVE_ARTS_TRUE@artssources = ao_arts.c
@HAVE_ARTS_FALSE@artssources =
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@
libdir = $(plugindir)
lib_LTLIBRARIES = $(artsltlibs)
libarts_la_LDFLAGS = $(artsldflags)
-CFLAGS = @ARTS_CFLAGS@
libarts_la_LIBADD = @ARTS_LIBS@
libarts_la_SOURCES = $(artssources)
@@ -116,6 +115,7 @@ LIBS = @LIBS@
libarts_la_DEPENDENCIES =
@HAVE_ARTS_FALSE@libarts_la_OBJECTS =
@HAVE_ARTS_TRUE@libarts_la_OBJECTS = ao_arts.lo
+CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_plugins_esd_Makefile_am,v 1.1 2001/03/16 11:58:45 naddy Exp $
--- src/plugins/esd/Makefile.am.orig Thu Mar 15 18:48:53 2001
+++ src/plugins/esd/Makefile.am Thu Mar 15 18:49:16 2001
@@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign
if HAVE_ESD
esdltlibs = libesd.la
-esdldflags = -export-dynamic -avoid-version
+esdldflags = -export-dynamic \
+ -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
esdsources = ao_esd.c
else

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_plugins_esd_Makefile_in,v 1.1 2001/07/17 15:23:36 naddy Exp $
--- src/plugins/esd/Makefile.in.orig Tue Jul 17 16:40:20 2001
+++ src/plugins/esd/Makefile.in Tue Jul 17 16:40:48 2001
@@ -88,7 +88,7 @@ AUTOMAKE_OPTIONS = foreign
@HAVE_ESD_TRUE@esdltlibs = libesd.la
@HAVE_ESD_FALSE@esdltlibs =
-@HAVE_ESD_TRUE@esdldflags = -export-dynamic -avoid-version
+@HAVE_ESD_TRUE@esdldflags = -export-dynamic -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
@HAVE_ESD_FALSE@esdldflags =
@HAVE_ESD_TRUE@esdsources = ao_esd.c
@HAVE_ESD_FALSE@esdsources =

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_plugins_sun_Makefile_am,v 1.1 2001/06/30 13:16:42 naddy Exp $
--- src/plugins/sun/Makefile.am.orig Sat Jun 30 13:16:44 2001
+++ src/plugins/sun/Makefile.am Sat Jun 30 13:17:23 2001
@@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign
if HAVE_SUN_AUDIO
sunltlibs = libsun.la
-sunldflags = -export-dynamic -avoid-version
+sunldflags = -export-dynamic \
+ -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
sunsources = ao_sun.c
else

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_plugins_sun_Makefile_in,v 1.1 2001/07/17 15:23:36 naddy Exp $
--- src/plugins/sun/Makefile.in.orig Tue Jul 17 16:41:09 2001
+++ src/plugins/sun/Makefile.in Tue Jul 17 16:41:24 2001
@@ -88,7 +88,7 @@ AUTOMAKE_OPTIONS = foreign
@HAVE_SUN_AUDIO_TRUE@sunltlibs = libsun.la
@HAVE_SUN_AUDIO_FALSE@sunltlibs =
-@HAVE_SUN_AUDIO_TRUE@sunldflags = -export-dynamic -avoid-version
+@HAVE_SUN_AUDIO_TRUE@sunldflags = -export-dynamic -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
@HAVE_SUN_AUDIO_FALSE@sunldflags =
@HAVE_SUN_AUDIO_TRUE@sunsources = ao_sun.c
@HAVE_SUN_AUDIO_FALSE@sunsources =

View File

@ -1,29 +1,23 @@
$OpenBSD: patch-configure,v 1.2 2001/06/30 13:18:07 naddy Exp $
$OpenBSD: patch-configure,v 1.3 2001/07/17 15:23:37 naddy Exp $
--- configure.orig Mon Jun 18 18:08:30 2001
+++ configure Sat Jun 30 13:41:39 2001
@@ -1491,9 +1491,9 @@ if test -z "$GCC"; then
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
+++ configure Tue Jul 17 16:47:35 2001
@@ -1492,7 +1492,7 @@ if test -z "$GCC"; then
;;
*)
- DEBUG="-g"
DEBUG="-g"
- CFLAGS="-O"
- PROFILE="-g -p"
+ DEBUG="$CFLAGS -g"
+ CFLAGS="$CFLAGS"
+ PROFILE="$CFLAGS -g -p"
+ CFLAGS=""
PROFILE="-g -p"
;;
esac
else
@@ -1514,9 +1514,9 @@ else
PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
@@ -1515,8 +1515,8 @@ else
;;
*)
- DEBUG="-g -Wall -fsigned-char"
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -fsigned-char"
- PROFILE="-O20 -g -pg -fsigned-char"
+ DEBUG="$CFLAGS -g -Wall -fsigned-char"
+ CFLAGS="$CFLAGS -fsigned-char"
+ PROFILE="$CFLAGS -g -pg -fsigned-char"
+ CFLAGS="-fsigned-char"
+ PROFILE="-g -pg -fsigned-char"
;;
esac
fi

View File

@ -1,19 +1,15 @@
$OpenBSD: patch-configure,v 1.2 2001/06/30 13:18:09 naddy Exp $
$OpenBSD: patch-configure,v 1.3 2001/07/17 15:23:37 naddy Exp $
--- configure.orig Mon Jun 18 18:12:43 2001
+++ configure Sat Jun 30 13:42:24 2001
@@ -1620,9 +1620,9 @@ if test -z "$GCC"; then
CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+++ configure Tue Jul 17 16:50:28 2001
@@ -1621,7 +1621,7 @@ if test -z "$GCC"; then
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
- DEBUG="-g"
DEBUG="-g"
- CFLAGS="-O"
- PROFILE="-g -p" ;;
+ DEBUG="$CFLAGS -g"
+ CFLAGS="$CFLAGS"
+ PROFILE="$CFLAGS -g -p" ;;
+ CFLAGS=""
PROFILE="-g -p" ;;
esac
else
@@ -1712,9 +1712,9 @@ rm -f conftest*
CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
@ -21,9 +17,9 @@ $OpenBSD: patch-configure,v 1.2 2001/06/30 13:18:09 naddy Exp $
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+ DEBUG="$CFLAGS -g -Wall -fsigned-char"
+ CFLAGS="$CFLAGS -fsigned-char"
+ PROFILE="$CFLAGS -g -pg -fsigned-char" ;;
+ DEBUG="-g -Wall -fsigned-char"
+ CFLAGS="-fsigned-char"
+ PROFILE="-g -pg -fsigned-char" ;;
esac
fi
CFLAGS="$CFLAGS $cflags_save"

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2001/06/30 13:18:10 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2001/07/17 15:23:37 naddy Exp $
COMMENT= "play, encode, and manage Ogg Vorbis files"
DISTNAME= vorbis-tools-1.0rc1
@ -25,8 +25,9 @@ CONFIGURE_ARGS= --with-ogg-prefix=${LOCALBASE} \
--with-vorbis-dir=${LOCALBASE}/lib \
--with-ao-prefix=${LOCALBASE}
# use the big hammer to subdue automake/libtool dependencies
post-patch:
@cd ${WRKSRC} && touch acinclude.m4 aclocal.m4 configure.in
@find ${WRKSRC} -print0 | xargs -0 touch
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vorbis-tools

View File

@ -1,69 +0,0 @@
$OpenBSD: patch-acinclude_m4,v 1.2 2001/06/30 13:18:10 naddy Exp $
--- acinclude.m4.orig Tue Mar 27 00:35:47 2001
+++ acinclude.m4 Sat Jun 30 13:55:27 2001
@@ -300,3 +300,65 @@ int main ()
AC_SUBST(AO_LIBS)
rm -f conf.aotest
])
+
+dnl Shamelessly stolen from Joerg Schilling's star.
+dnl Copyright 1998 J. Schilling
+
+dnl Checks if mmap() works to get shared memory
+dnl Defines HAVE_SMMAP on success.
+AC_DEFUN(AC_FUNC_SMMAP,
+[AC_CACHE_CHECK([if mmap works to get shared memory], ac_cv_func_smmap,
+ [AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/mman.h>
+
+char *
+mkshare()
+{
+ int size = 8192;
+ int f;
+ char *addr;
+
+ if ((f = open("/dev/zero", 2)) < 0)
+ exit(1);
+ addr = mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, f, 0);
+ if (addr == (char *)-1)
+ exit(1);
+ close(f);
+
+ return (addr);
+}
+
+main()
+{
+ char *addr;
+
+ addr = mkshare(8192);
+ *addr = 'I';
+
+ switch (fork()) {
+
+ case -1:
+ printf("help\n"); exit(1);
+
+ case 0: /* child */
+ *addr = 'N';
+ _exit(0);
+ break;
+ default: /* parent */
+ wait(0);
+ sleep(1);
+ break;
+ }
+
+ if (*addr != 'N')
+ exit(1);
+ exit(0);
+}
+],
+ [ac_cv_func_smmap=yes],
+ [ac_cv_func_smmap=no],
+ [ac_cv_func_smmap=no])])
+if test $ac_cv_func_smmap = yes; then
+ AC_DEFINE(HAVE_SMMAP)
+fi])

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ogg123_Makefile_am,v 1.2 2001/06/30 13:18:11 naddy Exp $
--- ogg123/Makefile.am.orig Sun Mar 25 17:59:31 2001
+++ ogg123/Makefile.am Sat Jun 30 14:07:30 2001
@@ -3,9 +3,8 @@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = ogg123
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
doc_DATA = ogg123rc-example
-mandir = $(datadir)/man
man_MANS = ogg123.1
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@

View File

@ -1,12 +1,19 @@
$OpenBSD: patch-ogg123_Makefile_in,v 1.2 2001/03/17 17:07:11 naddy Exp $
--- ogg123/Makefile.in.orig Sat Mar 17 17:55:34 2001
+++ ogg123/Makefile.in Sat Mar 17 17:55:54 2001
@@ -85,7 +85,7 @@ AUTOMAKE_OPTIONS = foreign
$OpenBSD: patch-ogg123_Makefile_in,v 1.3 2001/07/17 15:23:37 naddy Exp $
--- ogg123/Makefile.in.orig Mon Jun 18 18:18:19 2001
+++ ogg123/Makefile.in Tue Jul 17 16:59:11 2001
@@ -28,6 +28,7 @@ sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
+mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
@@ -85,7 +86,6 @@ AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = ogg123
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
doc_DATA = ogg123rc-example
-mandir = $(datadir)/man
+mandir = $(prefix)/man
man_MANS = ogg123.1
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-ogginfo_Makefile_am,v 1.1 2001/06/30 13:18:11 naddy Exp $
--- ogginfo/Makefile.am.orig Sat Jun 30 14:08:14 2001
+++ ogginfo/Makefile.am Sat Jun 30 14:08:32 2001
@@ -3,7 +3,6 @@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = ogginfo
-mandir = $(datadir)/man
man_MANS = ogginfo.1
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-ogginfo_Makefile_in,v 1.1 2001/07/17 15:23:37 naddy Exp $
--- ogginfo/Makefile.in.orig Tue Jul 17 16:58:54 2001
+++ ogginfo/Makefile.in Tue Jul 17 16:59:12 2001
@@ -28,6 +28,7 @@ sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
+mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
@@ -83,7 +84,6 @@ VORBIS_LIBS = @VORBIS_LIBS@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = ogginfo
-mandir = $(datadir)/man
man_MANS = ogginfo.1
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@