projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 21118559 SS |
1 | diff -Nur nftables-20140118.orig/configure nftables-20140118/configure |
| 2 | --- nftables-20140118.orig/configure 2014-01-17 22:28:04.000000000 -0700 | |
| 3 | +++ nftables-20140118/configure 2014-01-18 15:42:10.427000000 -0700 | |
| 4 | @@ -3310,8 +3310,8 @@ | |
| 5 | rm -f conftest.sed | |
| 6 | ||
| 7 | ||
| 8 | -# Extract the first word of "docbook2x-man", so it can be a program name with args. | |
| 9 | -set dummy docbook2x-man; ac_word=$2 | |
| 10 | +# Extract the first word of "db2x_docbook2man", so it can be a program name with args. | |
| 11 | +set dummy db2x_docbook2man; ac_word=$2 | |
| 12 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| 13 | $as_echo_n "checking for $ac_word... " >&6; } | |
| 14 | if test "${ac_cv_prog_CONFIG_MAN+set}" = set; then : | |
| 15 | @@ -3350,8 +3350,8 @@ | |
| 16 | ||
| 17 | if test "$CONFIG_MAN" != "y" | |
| 18 | then | |
| 19 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: docbookx2-man not found, no manpages will be built" >&5 | |
| 20 | -$as_echo "$as_me: WARNING: docbookx2-man not found, no manpages will be built" >&2;} | |
| 21 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: db2x_docbook2man not found, no manpages will be built" >&5 | |
| 22 | +$as_echo "$as_me: WARNING: db2x_docbook2man not found, no manpages will be built" >&2;} | |
| 23 | fi | |
| 24 | ||
| 25 | # Extract the first word of "db2pdf", so it can be a program name with args. | |
| 26 | diff -Nur nftables-20140118.orig/configure.ac nftables-20140118/configure.ac | |
| 27 | --- nftables-20140118.orig/configure.ac 2014-01-17 22:28:00.000000000 -0700 | |
| 28 | +++ nftables-20140118/configure.ac 2014-01-18 15:42:24.483000000 -0700 | |
| 29 | @@ -25,10 +25,10 @@ | |
| 30 | AC_PROG_INSTALL | |
| 31 | AC_PROG_SED | |
| 32 | ||
| 33 | -AC_CHECK_PROG(CONFIG_MAN, docbook2x-man, y, n) | |
| 34 | +AC_CHECK_PROG(CONFIG_MAN, db2x_docbook2man, y, n) | |
| 35 | if test "$CONFIG_MAN" != "y" | |
| 36 | then | |
| 37 | - AC_MSG_WARN([docbookx2-man not found, no manpages will be built]) | |
| 38 | + AC_MSG_WARN([db2x_docbook2man not found, no manpages will be built]) | |
| 39 | fi | |
| 40 | ||
| 41 | AC_CHECK_PROG(CONFIG_PDF, db2pdf, y, n) | |
| 42 | diff -Nur nftables-20140118.orig/Makefile.rules.in nftables-20140118/Makefile.rules.in | |
| 43 | --- nftables-20140118.orig/Makefile.rules.in 2014-01-17 22:28:00.000000000 -0700 | |
| 44 | +++ nftables-20140118/Makefile.rules.in 2014-01-18 15:27:45.759000000 -0700 | |
| 45 | @@ -37,7 +37,7 @@ | |
| 46 | ||
| 47 | %.8: %.xml $(makedeps) | |
| 48 | @echo -e " MAN\t\t$@" | |
| 49 | - (cd $(SUBDIR); docbook2x-man ../$<) | |
| 50 | + (cd $(SUBDIR); db2x_docbook2man ../$<) | |
| 51 | ||
| 52 | %.pdf: %.xml $(makedeps) | |
| 53 | @echo -e " PDF\t\t$@" |