mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
58 lines
1.6 KiB
Plaintext
58 lines
1.6 KiB
Plaintext
From 2620afc432e102f21a44de0576eb9d901cb7c069 Mon Sep 17 00:00:00 2001
|
|
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
|
Date: Tue, 11 Jun 2013 14:17:52 +0200
|
|
Subject: configure.in: use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER
|
|
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index 7141645..3a01896 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -19,7 +19,7 @@ AM_PROG_LIBTOOL
|
|
AM_PROG_CC_C_O
|
|
|
|
dnl config.h
|
|
-AM_CONFIG_HEADER(config.h)
|
|
+AC_CONFIG_HEADERS(config.h)
|
|
|
|
dnl Set some options based on environment
|
|
|
|
--
|
|
1.7.5
|
|
|
|
|
|
From 79c094d54944f3a970851157f7937811fb73f9d7 Mon Sep 17 00:00:00 2001
|
|
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
|
Date: Tue, 11 Jun 2013 14:18:38 +0200
|
|
Subject: doc[/libogg]/Makefile.am: don't hard-code docdir
|
|
|
|
|
|
diff --git a/doc/Makefile.am b/doc/Makefile.am
|
|
index 9c2c316..9c727c4 100644
|
|
--- a/doc/Makefile.am
|
|
+++ b/doc/Makefile.am
|
|
@@ -2,8 +2,6 @@
|
|
|
|
SUBDIRS = libogg
|
|
|
|
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
|
|
-
|
|
doc_DATA = framing.html index.html oggstream.html ogg-multiplex.html \
|
|
stream.png vorbisword2.png white-ogg.png white-xifish.png \
|
|
rfc3533.txt rfc5334.txt skeleton.html
|
|
diff --git a/doc/libogg/Makefile.am b/doc/libogg/Makefile.am
|
|
index 9eb7d34..e34c8a8 100644
|
|
--- a/doc/libogg/Makefile.am
|
|
+++ b/doc/libogg/Makefile.am
|
|
@@ -1,7 +1,5 @@
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg
|
|
-
|
|
doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\
|
|
general.html index.html ogg_packet.html ogg_packet_clear.html\
|
|
ogg_page.html ogg_page_bos.html ogg_page_checksum_set.html\
|
|
--
|
|
1.7.5
|
|
|