updated projects/vbootstrap: gettext 対応

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@2517 ec354946-7b23-47d6-9f5a-488ba84defc7

Makefile

@@ -13,7 +13,8 @@ VBUILDER_BUILT_RPMS_DIR=$$\{HOME\}/rpm/vbuilder
 DESTDIR=
 
 all:
-	sed -e "s/@@VBOOTSTRAP_VERSION@@/${VERSION}/g" vbootstrap.sh.in > vbootstrap.sh
+	sed -e "s/@@VBOOTSTRAP_VERSION@@/${VERSION}/g" \
+		vbootstrap.sh.in > vbootstrap.sh
 	sed -e "s/@@VBUILDER_STABLE_VERSION@@/${VBUILDER_STABLE_VERSION}/g" \
 	    -e "s/@@VBUILDER_DEFAULT_VERSION@@/${VBUILDER_DEFAULT_VERSION}/g" \
 	    -e "s/@@VBUILDER_CATEGORIES@@/${VBUILDER_CATEGORIES}/g" \
@@ -28,6 +29,8 @@ all:
 	    -e "s|@@VBUILDER_BUILT_RPMS_DIR@@|${VBUILDER_BUILT_RPMS_DIR}|g" \
 		vbuilder.conf.in > vbuilder.conf
 
+	cd po && make
+
 install:
 	install -d ${DESTDIR}/usr/share/vbootstrap/{scripts,sources.list.d}
 	install -d ${DESTDIR}/usr/sbin
@@ -40,6 +43,8 @@ install:
 	install -m 644 vbuilder.conf ${DESTDIR}/etc/vbootstrap/vbuilder.conf
 	install -m 644 vbuilder-bash-completion.sh ${DESTDIR}/etc/bash_completion.d/vbuilder
 
+	cd po && make install DESTDIR=${DESTDIR}
+
 tarbz2: clean
 	cd .. && rm -rf ${NAME}-${VERSION}
 	cd .. && cp -arf trunk ${NAME}-${VERSION}
@@ -57,3 +62,5 @@ rpm: tarbz2
 clean:
 	rm -fr *~ .*???~ vbootstrap.sh vbuilder.sh vbuilder.conf
 	find . -name *~ -exec rm -f {} \;
+
+	cd po && make clean

po/Makefile

@@ -5,7 +5,8 @@ GETTEXT_PACKAGE = ${NAME}
 srcdir = .
 top_srcdir = ..
 
-datarootdir = ${prefix}/share
+prefix = /usr
+datadir = ${prefix}/share
 
 gnulocaledir = $(datadir)/locale
 
@@ -15,8 +16,8 @@ GMSGFMT = /usr/bin/msgfmt
 XGETTEXT = /usr/bin/xgettext
 
 LANGS=ja
-POFILES=$(shell for lang in "$(LANGS)"; do printf "$$lang.po "; done);
-GMOFILES=$(shell for lang in "$(LANGS)"; do printf "$$lang.gmo "; done;);
+POFILES=$(shell for lang in "$(LANGS)"; do printf "$$lang.po "; done)
+GMOFILES=$(shell for lang in "$(LANGS)"; do printf "$$lang.gmo "; done;)
 
 CATALOGS=$(GMOFILES)
 CATOBJEXT = .gmo
@@ -55,38 +56,16 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot:
 		&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
 
 install: all
-	mkdir -p $(DESTDIR)$(datadir)
+	@mkdir -p $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
+	  destdir=$(gnulocaledir); \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 	  mkdir -p $$dir; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
+	  install -m0644 $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+	  echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
 	done
 
 update-po: Makefile