mirror of
https://github.com/fish-shell/fish-shell
synced 2025-01-27 20:25:12 +00:00
Cleanup Makefile.in and make sure gen_hdr.sh is executable before using it
darcs-hash:20060123113807-ac50b-3959a084721ea2aebd7e5751788c82f633c2984a.gz
This commit is contained in:
parent
bb079f5446
commit
b969a175d4
1 changed files with 9 additions and 5 deletions
14
Makefile.in
14
Makefile.in
|
@ -28,12 +28,14 @@
|
||||||
# hallucinations.
|
# hallucinations.
|
||||||
#
|
#
|
||||||
|
|
||||||
# Compiler flags
|
# Programs
|
||||||
CC := @CC@
|
CC := @CC@
|
||||||
|
INSTALL:=@INSTALL@
|
||||||
|
|
||||||
|
# Compiler flags
|
||||||
CFLAGS := @CFLAGS@ @INCLUDEDIR@ -Wall -std=gnu99 -fno-strict-aliasing
|
CFLAGS := @CFLAGS@ @INCLUDEDIR@ -Wall -std=gnu99 -fno-strict-aliasing
|
||||||
CPPFLAGS=@CPPFLAGS@
|
CPPFLAGS=@CPPFLAGS@
|
||||||
LDFLAGS:= -l@CURSESLIB@ @LIBS@ @LDFLAGS@ @LIBDIR@
|
LDFLAGS:= -l@CURSESLIB@ @LIBS@ @LDFLAGS@ @LIBDIR@
|
||||||
INSTALL:=@INSTALL@
|
|
||||||
|
|
||||||
# Installation directories
|
# Installation directories
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
|
@ -248,12 +250,12 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create a template translation object
|
# Create a template translation object
|
||||||
messages.pot: *.c *.h init/*.in init/*.fish init/completions/*.fish
|
messages.pot: *.c *.h init/*.in init/*.fish init/completions/*.fish seq
|
||||||
if test $(HAVE_GETTEXT) = 1;then \
|
if test $(HAVE_GETTEXT) = 1;then \
|
||||||
xgettext -k_ -kN_ -kcomplete_desc *.c *.h -o messages.pot; \
|
xgettext -k_ -kN_ -kcomplete_desc *.c *.h -o messages.pot; \
|
||||||
if ! xgettext -j -k_ -LShell init/*.in init/*.fish init/completions/*.fish -o messages.pot; then \
|
if ! xgettext -j -k_ -LShell init/*.in init/*.fish init/completions/*.fish seq -o messages.pot; then \
|
||||||
echo "Your xgettext version is too old to build the messages.pot file"\
|
echo "Your xgettext version is too old to build the messages.pot file"\
|
||||||
rm messages.pot
|
rm messages.pot\
|
||||||
false;\
|
false;\
|
||||||
fi; \
|
fi; \
|
||||||
fi
|
fi
|
||||||
|
@ -293,6 +295,7 @@ messages.pot: *.c *.h init/*.in init/*.fish init/completions/*.fish
|
||||||
builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh builtin_help.hdr $(CMD_DOC_HDR)
|
builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh builtin_help.hdr $(CMD_DOC_HDR)
|
||||||
cd doc_src; doxygen; cd ..;
|
cd doc_src; doxygen; cd ..;
|
||||||
cp builtin_help.hdr builtin_help.c;
|
cp builtin_help.hdr builtin_help.c;
|
||||||
|
chmod 755 gen_hdr.sh
|
||||||
for i in $(BUILTIN_DOC_HDR) doc_src/count.doxygen ; do \
|
for i in $(BUILTIN_DOC_HDR) doc_src/count.doxygen ; do \
|
||||||
echo ' hash_put( &tbl, L"'`basename $$i .doxygen`'",' >>$@; \
|
echo ' hash_put( &tbl, L"'`basename $$i .doxygen`'",' >>$@; \
|
||||||
./gen_hdr.sh $$i >>$@; \
|
./gen_hdr.sh $$i >>$@; \
|
||||||
|
@ -314,6 +317,7 @@ builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh bui
|
||||||
echo "void print_help()" >>$@
|
echo "void print_help()" >>$@
|
||||||
echo "{" >>$@
|
echo "{" >>$@
|
||||||
echo ' printf( "%s",' >>$@
|
echo ' printf( "%s",' >>$@
|
||||||
|
chmod 755 gen_hdr.sh
|
||||||
./gen_hdr.sh $*.doxygen >>$@
|
./gen_hdr.sh $*.doxygen >>$@
|
||||||
echo ");" >>$@
|
echo ");" >>$@
|
||||||
echo "}" >>$@
|
echo "}" >>$@
|
||||||
|
|
Loading…
Reference in a new issue