diff options
| author | Fritz Elfert <felfert@to.com> | 2002-07-16 23:02:37 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2002-07-16 23:02:37 +0000 |
| commit | 01b8f1000089ca02330dcb8a60da82477cbbdb21 (patch) | |
| tree | acf49cfd55837e01909228b5b6d5d1004f74cc68 | |
| parent | b7e466900330bbe60f89e4a8ae4842d7368c2e1f (diff) | |
| download | plptools-01b8f1000089ca02330dcb8a60da82477cbbdb21.tar.gz plptools-01b8f1000089ca02330dcb8a60da82477cbbdb21.tar.bz2 plptools-01b8f1000089ca02330dcb8a60da82477cbbdb21.zip | |
- Tweaks for gettext 0.11
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | Makefile.am.in (renamed from Makefile.am) | 1 | ||||
| -rw-r--r-- | Makefile.cvs | 17 | ||||
| -rw-r--r-- | conf/intlclean | 13 | ||||
| -rw-r--r-- | configure.in.in (renamed from configure.in) | 0 | ||||
| -rw-r--r-- | po/.cvsignore | 2 |
6 files changed, 30 insertions, 4 deletions
@@ -8,5 +8,6 @@ config.cache config.log plptools-*.tar.gz intl +m4 .vimsession .emacs.desktop diff --git a/Makefile.am b/Makefile.am.in index 243dc1d..64e6cb0 100644 --- a/Makefile.am +++ b/Makefile.am.in @@ -25,6 +25,7 @@ TMPDEST= # maintainer-clean-local: rm -f configure aclocal.m4 Makefile.in libtool \ + Makefile.am configure.in \ conf/config.guess conf/config.sub conf/install-sh conf/ltconfig \ conf/ltmain.sh conf/missing conf/mkinstalldirs \ etc/*.spec ABOUT-NLS diff --git a/Makefile.cvs b/Makefile.cvs index 8a3e59b..25f60f5 100644 --- a/Makefile.cvs +++ b/Makefile.cvs @@ -3,6 +3,8 @@ AUTOMAKEFILES = conf/mkinstalldirs conf/missing conf/install-sh CONFIGHIN = include/config.h.in ACLOCAL = conf/aclocal.m4 GETTEXT = intl/Makefile.in +GETTEXTSHIT = Makefile.am.in configure.in.in +GV = $(shell gettextize --version|head -1|cut -d ' ' -f4|cut -d. -f2) all: @echo "Use make devel for development, make dist for distribution" @@ -33,7 +35,7 @@ htmldoc: done $(ACLOCAL): - aclocal -I conf/m4/plptools -I conf/m4/kde + aclocal -I conf/m4/plptools -I conf/m4/kde $(M4SUB) $(CONFIGHIN): acconfig.h configure.in autoheader @@ -41,8 +43,17 @@ $(CONFIGHIN): acconfig.h configure.in $(LIBTOOLFILES): libtoolize --force -$(GETTEXT): $(ACLOCAL) - echo n | gettextize -f +$(GETTEXT): $(GETTEXTSHIT) +ifeq ($(GV),11) + cp configure.in.in configure.in + cp Makefile.am.in Makefile.am + mkdir -p intl + echo n | gettextize --force --intl --no-changelog + cp po/Makevars.template po/Makevars + rm -f ChangeLog *~ +else + echo n | gettextize $(GP) +endif -test -f po/ChangeLog~ && mv -f po/ChangeLog~ po/ChangeLog $(AUTOMAKEFILES): $(ACLOCAL) $(CONFIGHIN) diff --git a/conf/intlclean b/conf/intlclean index fe6eb0a..f5a7846 100644 --- a/conf/intlclean +++ b/conf/intlclean @@ -1,6 +1,17 @@ +cat<<EOF>po/Makefile +maintainer-clean: + rm -f \ + Make*.in boldquot.sed en@boldquot.header \ + en@quot.header insert-header.sin Makevars.template \ + quot.sed remove-potcdate.sin Rules-quot Makefile Makevars +EOF cat<<EOF>intl/Makefile +maintainer-clean: + cd .. && rm -rf intl +EOF +cat<<EOF>m4/Makefile maintainer-clean: - rm -f *.[ch] *.in *.sed VERSION ChangeLog Makefile + cd .. && rm -rf m4 EOF diff --git a/configure.in b/configure.in.in index a91ae5f..a91ae5f 100644 --- a/configure.in +++ b/configure.in.in diff --git a/po/.cvsignore b/po/.cvsignore index d4d149d..b651686 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -1,7 +1,9 @@ Makefile.in Makefile +Makevars stamp-cat-id POTFILES *.c *.gmo *.pot +*.sed |