Check in to test "make archive".

CVS patchset: 2493
CVS date: 1998/10/22 19:39:12

diff --git a/popt/.cvsignore b/popt/.cvsignore
index 3f35980..8f1ef3c 100644 (file)
--- a/popt/.cvsignore
+++ b/popt/.cvsignore
@@ -10,4 +10,6 @@ config.log
 config.cache
 config.satus
 config.status
+stamp-h
+stamp-h.in
 test1

diff --git a/popt/Makefile.am b/popt/Makefile.am
index d2dd63a..75f1520 100644 (file)
--- a/popt/Makefile.am
+++ b/popt/Makefile.am
@@ -14,3 +14,22 @@ test1_LDADD = -lpopt
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+
+CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
+
+.PHONY: archive
+archive: 
+       @echo "This is $(PACKAGE)-$(VERSION)."
+       @sleep 5
+       @cvs -Q tag -F $(CVSTAG) .
+       rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
+       cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
+       mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
+       cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
+       cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
+       cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
+       rm -rf /tmp/$(PACKAGE)-$(VERSION)
+       cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
+       rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
+       @echo " "
+       @echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."

diff --git a/popt/Makefile.in b/popt/Makefile.in
index cba83ba..c3771e0 100644 (file)
--- a/popt/Makefile.in
+++ b/popt/Makefile.in
@@ -82,6 +82,8 @@ test1_LDADD = -lpopt
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+
+CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -437,6 +439,23 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+.PHONY: archive
+archive: 
+       @echo "This is $(PACKAGE)-$(VERSION)."
+       @sleep 5
+       @cvs -Q tag -F $(CVSTAG) .
+       rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
+       cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
+       mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
+       cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
+       cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
+       cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
+       rm -rf /tmp/$(PACKAGE)-$(VERSION)
+       cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
+       rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
+       @echo " "
+       @echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/popt/configure.in b/popt/configure.in
index b01dbbb..8f64fdc 100755 (executable)
--- a/popt/configure.in
+++ b/popt/configure.in
@@ -59,4 +59,5 @@ AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
 
-AC_OUTPUT(Makefile po/Makefile)
+AC_OUTPUT([Makefile po/Makefile.in],
+       [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])

diff --git a/popt/po/.cvsignore b/popt/po/.cvsignore
new file mode 100644 (file)
index 0000000..8f58e9b
--- /dev/null
+++ b/popt/po/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+POTFILES
+*.mo

diff --git a/popt/po/Makefile.in b/popt/po/Makefile.in
index d3cdfd1..2f041d3 100644 (file)
--- a/popt/po/Makefile.in
+++ b/popt/po/Makefile.in
@@ -2,12 +2,12 @@
 srcdir = .
 top_srcdir = ..
 
-INSTALL= /usr/bin/ginstall -c
+INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
 
-installprefix = @prefix@
+installprefix = $(DESTDIR)
 
 MSGMERGE = msgmerge
 
@@ -16,14 +16,13 @@ NLSPACKAGE = popt
 LINGUAS = ro
 CATALOGS = $(addsuffix .mo, $(LINGUAS))
 
-POTFILES = $(shell ls ../*.c)
+POTFILES = \
 
 all: $(NLSPACKAGE).pot $(CATALOGS)
 
 $(NLSPACKAGE).pot: $(POTFILES)
        xgettext --default-domain=$(NLSPACKAGE) \
-           --add-comments --keyword=_ --keyword=N_ \
-           --keyword=POPT_ $(POTFILES)
+           --add-comments --keyword=_ --keyword=N_ $(POTFILES)
        if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
            rm -f $(NLSPACKAGE).po; \
        else \
@@ -57,7 +56,7 @@ install:
            l=`basename $$n .mo`; \
            $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
            $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
-           $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/popt.mo; \
+           $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
        done
 
 check:
@@ -72,5 +71,10 @@ POTFILES: POTFILES.in
              -e "s@.*@ $$posrcprefix& \\\\@" \
              -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
 
+Makefile: Makefile.in.in ../config.status POTFILES
+       cd .. \
+         && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
+              $(SHELL) ./config.status
+
 %.mo: %.po
        msgfmt -o $@ $<

diff --git a/popt/po/Makefile.in.in b/popt/po/Makefile.in.in
new file mode 100644 (file)
index 0000000..81bd73d
--- /dev/null
+++ b/popt/po/Makefile.in.in
@@ -0,0 +1,80 @@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = $(srcdir)
+
+INSTALL= @INSTALL@
+INSTALL_PROGRAM= @INSTALL_PROGRAM@
+INSTALL_DATA= @INSTALL_DATA@
+CC = @CC@
+
+installprefix = $(DESTDIR)
+
+MSGMERGE = msgmerge
+
+NLSPACKAGE = @PACKAGE@
+
+LINGUAS = ro
+CATALOGS = $(addsuffix .mo, $(LINGUAS))
+
+POTFILES = \
+
+all: $(NLSPACKAGE).pot $(CATALOGS)
+
+$(NLSPACKAGE).pot: $(POTFILES)
+       xgettext --default-domain=$(NLSPACKAGE) \
+           --add-comments --keyword=_ --keyword=N_ $(POTFILES)
+       if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
+           rm -f $(NLSPACKAGE).po; \
+       else \
+           mv $(NLSPACKAGE).po $(NLSPACKAGE).pot; \
+       fi
+
+update-po: Makefile
+       @$(MAKE) $(NLSPACKAGE).pot
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+               lang=`echo $$cat | sed 's/.mo//'`; \
+               if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pox ; then \
+                       echo "$(MSGMERGE) of $$lang succeeded" ; \
+                       mv $$lang.pox $$lang.po ; \
+               else \
+                       echo "$(MSGMERGE) of $$lang failed" ; \
+                       rm -f $$lang.pox ; \
+               fi \
+       done
+
+clean:
+       rm -f *mo $(NLSPACKAGE).pot
+
+distclean: clean
+       rm -f .depend Makefile
+
+depend:
+
+install:
+       for n in $(CATALOGS); do \
+           l=`basename $$n .mo`; \
+           $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
+           $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
+           $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
+       done
+
+check:
+
+POTFILES: POTFILES.in
+       ( if test 'x$(srcdir)' != 'x.'; then \
+           posrcprefix='$(top_srcdir)/'; \
+         else \
+           posrcprefix="../"; \
+         fi; \
+         sed -e '/^#/d' -e '/^[        ]*$$/d' \
+             -e "s@.*@ $$posrcprefix& \\\\@" \
+             -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
+
+Makefile: Makefile.in.in ../config.status POTFILES
+       cd .. \
+         && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
+              $(SHELL) ./config.status
+
+%.mo: %.po
+       msgfmt -o $@ $<

diff --git a/popt/po/POTFILES.in b/popt/po/POTFILES.in
new file mode 100644 (file)
index 0000000..4817ca1
--- /dev/null
+++ b/popt/po/POTFILES.in
@@ -0,0 +1,11 @@
+# List of files which contain translatable strings.
+
+# Package source files
+
+findme.c
+popt.c
+poptconfig.c
+popthelp.c
+poptparse.c
+test1.c
+

diff --git a/popt/po/popt.pot b/popt/po/popt.pot
new file mode 100644 (file)
index 0000000..77169cb
--- /dev/null
+++ b/popt/po/popt.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1998-10-22 15:37-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: ../popthelp.c:29
+msgid "Show this help message"
+msgstr ""
+
+#: ../popthelp.c:30
+msgid "Display brief usage message"
+msgstr ""