*/Makefile.am: Replace INCLUDES with AM_CPPFLAGS #17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wking
force-pushed
the
includes-to-am-cppflags
branch
from
887d5c8
to
c073976
Compare
Catch up with Automake's [1], which was part of v1.6b, cut 2002-07-28 [2]. Avoids: $ autoreconf -v -f --install ... libmisc/Makefile.am:4: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') ... src/Makefile.am:10: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') ... Consolidating with the earlier AM_CPPFLAGS avoids: $ autoreconf -v -f --install src/Makefile.am:72: warning: AM_CPPFLAGS multiply defined in condition TRUE ... src/Makefile.am:10: ... 'AM_CPPFLAGS' previously defined here autoreconf-2.69: Leaving directory `.' [1]: http://git.savannah.gnu.org/cgit/automake.git/commit/?id=1415d22f6203206bc393fc4ea233123ba579222d Summary: automake.in (generate_makefile): Suggest using AM_CPPFLAGS instead of INCLUDES Date: 2002-07-09 [2]: http://git.savannah.gnu.org/cgit/automake.git/tag/?id=Release-1-6b
|
Thanks, it looks good to me. As I'm pretty autoconf-illiterate I'll
give it a bit more time for others to comment.
|
|
On Mon, May 02, 2016 at 07:08:09AM -0700, Serge Hallyn wrote:
I haven't finished putting it through its paces yet either. Will post |
|
Awesome, thanks much.
|
|
Ping - @wking have you had a chance to put it through its paces? |
|
(ping) |
|
Right, sorry for the delay. Rebased onto master with c073976 →
d49e529 and tested with:
$ git clean -xdf
$ autoreconf -v -f --install
$ ./configure
$ make
$ make install
…
pl.po:63: 'msgid' and 'msgstr' entries do not both begin with '\n'
…
pl.po:2404: 'msgid' and 'msgstr' entries do not both begin with '\n'
/usr/bin/gmsgfmt: found 45 fatal errors
523 translated messages, 58 fuzzy translations, 8 untranslated messages.
Makefile:233: recipe for target 'pl.gmo' failed
make[3]: *** [pl.gmo] Error 1
make[3]: Leaving directory '/home/wking/src/random/shadow/po'
Makefile:263: recipe for target 'stamp-po' failed
make[2]: *** [stamp-po] Error 2
make[2]: Leaving directory '/home/wking/src/random/shadow/po'
Makefile:436: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/home/wking/src/random/shadow'
Makefile:364: recipe for target 'all' failed
make: *** [all] Error 2
The trouble with po/pl.po seems to be for cases like:
#, c-format
msgid "Cannot create SELinux management handle\n"
msgstr "\n"
where the translated string is just a newline. Work around that by
skipping NLS:
$ ./configure --disable-nls
$ make
…
Error: you need to run configure with '--enable-man'
in order to regenerate man pages.
…
That's a little odd, but I like man pages, so enable them:
$ ./configure --disable-nls --enable-man
$ make
$ echo $?
0
$ ./src/id
UID=1000(wking) GID=1000(wking)
The build succeeds and the compiled stuff works. So I think this PR
is good to go.
|
|
On Fri, Dec 02, 2016 at 09:25:20PM -0800, W. Trevor King wrote:
$ make install
…
pl.po:63: 'msgid' and 'msgstr' entries do not both begin with '\n'
…
pl.po:2404: 'msgid' and 'msgstr' entries do not both begin with '\n'
/usr/bin/gmsgfmt: found 45 fatal errors
523 translated messages, 58 fuzzy translations, 8 untranslated messages.
Makefile:233: recipe for target 'pl.gmo' failed
make[3]: *** [pl.gmo] Error 1
make[3]: Leaving directory '/home/wking/src/random/shadow/po'
Makefile:263: recipe for target 'stamp-po' failed
make[2]: *** [stamp-po] Error 2
make[2]: Leaving directory '/home/wking/src/random/shadow/po'
Makefile:436: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/home/wking/src/random/shadow'
Makefile:364: recipe for target 'all' failed
make: *** [all] Error 2
The trouble with po/pl.po seems to be for cases like:
#, c-format
msgid "Cannot create SELinux management handle\n"
msgstr "\n"
where the translated string is just a newline.
|
|
So can this also be merged if #50 was simply reverted? |
|
Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Catch up with Automake, where the deprecation notice landed in
v1.6b, cut 2002-07-28. Avoids: