Author: keichwa Date: 2015-11-11 10:20:18 +0100 (Wed, 11 Nov 2015) New Revision: 94823 Modified: trunk/yast/af/Makefile.am trunk/yast/af/configure.ac trunk/yast/am/Makefile.am trunk/yast/am/configure.ac trunk/yast/ar/Makefile.am trunk/yast/ar/configure.ac trunk/yast/ast/Makefile.am trunk/yast/ast/configure.ac trunk/yast/be/Makefile.am trunk/yast/be/configure.ac trunk/yast/bg/Makefile.am trunk/yast/bg/configure.ac trunk/yast/bn/Makefile.am trunk/yast/bn/configure.ac trunk/yast/bs/Makefile.am trunk/yast/bs/configure.ac trunk/yast/ca/Makefile.am trunk/yast/ca/configure.ac trunk/yast/cs/Makefile.am trunk/yast/cs/configure.ac trunk/yast/cy/Makefile.am trunk/yast/cy/configure.ac trunk/yast/da/Makefile.am trunk/yast/da/configure.ac trunk/yast/de/Makefile.am trunk/yast/el/Makefile.am trunk/yast/el/configure.ac trunk/yast/en_GB/Makefile.am trunk/yast/en_GB/configure.ac trunk/yast/en_US/Makefile.am trunk/yast/en_US/configure.ac trunk/yast/eo/Makefile.am trunk/yast/eo/configure.ac trunk/yast/es/Makefile.am trunk/yast/es/configure.ac trunk/yast/et/Makefile.am trunk/yast/et/configure.ac trunk/yast/eu/Makefile.am trunk/yast/eu/configure.ac trunk/yast/fa/Makefile.am trunk/yast/fa/configure.ac trunk/yast/fi/Makefile.am trunk/yast/fi/configure.ac trunk/yast/fr/Makefile.am trunk/yast/fr/configure.ac trunk/yast/gl/Makefile.am trunk/yast/gl/configure.ac trunk/yast/gu/Makefile.am trunk/yast/gu/configure.ac trunk/yast/he/Makefile.am trunk/yast/he/configure.ac trunk/yast/hi/Makefile.am trunk/yast/hi/configure.ac trunk/yast/hr/Makefile.am trunk/yast/hr/configure.ac trunk/yast/hu/Makefile.am trunk/yast/hu/configure.ac trunk/yast/id/Makefile.am trunk/yast/id/configure.ac trunk/yast/it/Makefile.am trunk/yast/it/configure.ac trunk/yast/ja/Makefile.am trunk/yast/ja/configure.ac trunk/yast/jv/Makefile.am trunk/yast/jv/configure.ac trunk/yast/ka/Makefile.am trunk/yast/ka/configure.ac trunk/yast/km/Makefile.am trunk/yast/km/configure.ac trunk/yast/kn/Makefile.am trunk/yast/kn/configure.ac trunk/yast/ko/Makefile.am trunk/yast/ko/configure.ac trunk/yast/ku/Makefile.am trunk/yast/ku/configure.ac trunk/yast/lo/Makefile.am trunk/yast/lo/configure.ac trunk/yast/lt/Makefile.am trunk/yast/lt/configure.ac trunk/yast/lv/Makefile.am trunk/yast/lv/configure.ac trunk/yast/mk/Makefile.am trunk/yast/mk/configure.ac trunk/yast/mr/Makefile.am trunk/yast/mr/configure.ac trunk/yast/ms/Makefile.am trunk/yast/ms/configure.ac trunk/yast/my/Makefile.am trunk/yast/my/configure.ac trunk/yast/nb/Makefile.am trunk/yast/nb/configure.ac trunk/yast/nds/Makefile.am trunk/yast/nds/configure.ac trunk/yast/ne/Makefile.am trunk/yast/ne/configure.ac trunk/yast/nl/Makefile.am trunk/yast/nl/configure.ac trunk/yast/nn/Makefile.am trunk/yast/nn/configure.ac trunk/yast/pa/Makefile.am trunk/yast/pa/configure.ac trunk/yast/pl/Makefile.am trunk/yast/pl/configure.ac trunk/yast/ps/Makefile.am trunk/yast/ps/configure.ac trunk/yast/pt/Makefile.am trunk/yast/pt/configure.ac trunk/yast/pt_BR/Makefile.am trunk/yast/pt_BR/configure.ac trunk/yast/ro/Makefile.am trunk/yast/ro/configure.ac trunk/yast/ru/Makefile.am trunk/yast/ru/configure.ac trunk/yast/si/Makefile.am trunk/yast/si/configure.ac trunk/yast/sk/Makefile.am trunk/yast/sk/configure.ac trunk/yast/sl/Makefile.am trunk/yast/sl/configure.ac trunk/yast/sq/Makefile.am trunk/yast/sq/configure.ac trunk/yast/sr/Makefile.am trunk/yast/sr/configure.ac trunk/yast/sv/Makefile.am trunk/yast/sv/configure.ac trunk/yast/sw/Makefile.am trunk/yast/sw/configure.ac trunk/yast/ta/Makefile.am trunk/yast/ta/configure.ac trunk/yast/tg/Makefile.am trunk/yast/tg/configure.ac trunk/yast/th/Makefile.am trunk/yast/th/configure.ac trunk/yast/tk/Makefile.am trunk/yast/tk/configure.ac trunk/yast/tr/Makefile.am trunk/yast/tr/configure.ac trunk/yast/uk/Makefile.am trunk/yast/uk/configure.ac trunk/yast/vi/Makefile.am trunk/yast/vi/configure.ac trunk/yast/wa/Makefile.am trunk/yast/wa/configure.ac trunk/yast/xh/Makefile.am trunk/yast/xh/configure.ac trunk/yast/zh_CN/Makefile.am trunk/yast/zh_CN/configure.ac trunk/yast/zh_TW/Makefile.am trunk/yast/zh_TW/configure.ac trunk/yast/zu/Makefile.am trunk/yast/zu/configure.ac Log: stop using y2tool Modified: trunk/yast/af/Makefile.am =================================================================== --- trunk/yast/af/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/af/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/af/configure.ac =================================================================== --- trunk/yast/af/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/af/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-afvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-afvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-afvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/am/Makefile.am =================================================================== --- trunk/yast/am/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/am/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/am/configure.ac =================================================================== --- trunk/yast/am/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/am/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-amvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-amvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-amvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ar/Makefile.am =================================================================== --- trunk/yast/ar/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ar/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ar/configure.ac =================================================================== --- trunk/yast/ar/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ar/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-arvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-arvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-arvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ast/Makefile.am =================================================================== --- trunk/yast/ast/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ast/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ast/configure.ac =================================================================== --- trunk/yast/ast/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ast/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-astvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-astvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-astvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/be/Makefile.am =================================================================== --- trunk/yast/be/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/be/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/be/configure.ac =================================================================== --- trunk/yast/be/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/be/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-bevtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-bevtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-bevtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/bg/Makefile.am =================================================================== --- trunk/yast/bg/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/bg/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/bg/configure.ac =================================================================== --- trunk/yast/bg/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/bg/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-bgvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-bgvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-bgvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/bn/Makefile.am =================================================================== --- trunk/yast/bn/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/bn/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/bn/configure.ac =================================================================== --- trunk/yast/bn/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/bn/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-bnvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-bnvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-bnvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/bs/Makefile.am =================================================================== --- trunk/yast/bs/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/bs/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/bs/configure.ac =================================================================== --- trunk/yast/bs/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/bs/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-bsvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-bsvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-bsvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ca/Makefile.am =================================================================== --- trunk/yast/ca/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ca/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ca/configure.ac =================================================================== --- trunk/yast/ca/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ca/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-cavtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-cavtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-cavtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/cs/Makefile.am =================================================================== --- trunk/yast/cs/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/cs/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/cs/configure.ac =================================================================== --- trunk/yast/cs/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/cs/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-csvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-csvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-csvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/cy/Makefile.am =================================================================== --- trunk/yast/cy/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/cy/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/cy/configure.ac =================================================================== --- trunk/yast/cy/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/cy/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-cyvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-cyvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-cyvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/da/Makefile.am =================================================================== --- trunk/yast/da/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/da/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/da/configure.ac =================================================================== --- trunk/yast/da/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/da/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -20,7 +20,7 @@ dnl Important YaST2 variables VERSION="3.1.0" RPMNAME="yast2-trans-da" -MAINTAINER="Martin Schlander <suse@linuxin.dk>" +MAINTAINER="Karl Eichwalder <ke@suse.de>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-davtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-davtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-davtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/de/Makefile.am =================================================================== --- trunk/yast/de/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/de/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/el/Makefile.am =================================================================== --- trunk/yast/el/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/el/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/el/configure.ac =================================================================== --- trunk/yast/el/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/el/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-elvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-elvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-elvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/en_GB/Makefile.am =================================================================== --- trunk/yast/en_GB/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/en_GB/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/en_GB/configure.ac =================================================================== --- trunk/yast/en_GB/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/en_GB/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-en_GBvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-en_GBvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-en_GBvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/en_US/Makefile.am =================================================================== --- trunk/yast/en_US/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/en_US/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/en_US/configure.ac =================================================================== --- trunk/yast/en_US/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/en_US/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-en_USvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-en_USvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-en_USvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/eo/Makefile.am =================================================================== --- trunk/yast/eo/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/eo/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/eo/configure.ac =================================================================== --- trunk/yast/eo/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/eo/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-eovtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-eovtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-eovtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/es/Makefile.am =================================================================== --- trunk/yast/es/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/es/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/es/configure.ac =================================================================== --- trunk/yast/es/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/es/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-esvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-esvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-esvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/et/Makefile.am =================================================================== --- trunk/yast/et/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/et/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/et/configure.ac =================================================================== --- trunk/yast/et/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/et/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-etvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-etvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-etvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/eu/Makefile.am =================================================================== --- trunk/yast/eu/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/eu/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/eu/configure.ac =================================================================== --- trunk/yast/eu/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/eu/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-euvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-euvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-euvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/fa/Makefile.am =================================================================== --- trunk/yast/fa/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/fa/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/fa/configure.ac =================================================================== --- trunk/yast/fa/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/fa/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-favtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-favtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-favtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/fi/Makefile.am =================================================================== --- trunk/yast/fi/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/fi/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/fi/configure.ac =================================================================== --- trunk/yast/fi/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/fi/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-fivtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-fivtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-fivtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/fr/Makefile.am =================================================================== --- trunk/yast/fr/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/fr/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/fr/configure.ac =================================================================== --- trunk/yast/fr/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/fr/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-frvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-frvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-frvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/gl/Makefile.am =================================================================== --- trunk/yast/gl/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/gl/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/gl/configure.ac =================================================================== --- trunk/yast/gl/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/gl/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-glvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-glvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-glvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/gu/Makefile.am =================================================================== --- trunk/yast/gu/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/gu/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/gu/configure.ac =================================================================== --- trunk/yast/gu/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/gu/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-guvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-guvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-guvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/he/Makefile.am =================================================================== --- trunk/yast/he/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/he/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/he/configure.ac =================================================================== --- trunk/yast/he/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/he/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-hevtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-hevtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-hevtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/hi/Makefile.am =================================================================== --- trunk/yast/hi/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/hi/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/hi/configure.ac =================================================================== --- trunk/yast/hi/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/hi/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-hivtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-hivtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-hivtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/hr/Makefile.am =================================================================== --- trunk/yast/hr/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/hr/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/hr/configure.ac =================================================================== --- trunk/yast/hr/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/hr/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-hrvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-hrvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-hrvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/hu/Makefile.am =================================================================== --- trunk/yast/hu/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/hu/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/hu/configure.ac =================================================================== --- trunk/yast/hu/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/hu/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-huvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-huvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-huvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/id/Makefile.am =================================================================== --- trunk/yast/id/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/id/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/id/configure.ac =================================================================== --- trunk/yast/id/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/id/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-idvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-idvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-idvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/it/Makefile.am =================================================================== --- trunk/yast/it/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/it/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/it/configure.ac =================================================================== --- trunk/yast/it/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/it/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-itvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-itvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-itvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ja/Makefile.am =================================================================== --- trunk/yast/ja/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ja/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ja/configure.ac =================================================================== --- trunk/yast/ja/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ja/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-javtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-javtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-javtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/jv/Makefile.am =================================================================== --- trunk/yast/jv/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/jv/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/jv/configure.ac =================================================================== --- trunk/yast/jv/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/jv/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-jvvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-jvvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-jvvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ka/Makefile.am =================================================================== --- trunk/yast/ka/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ka/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ka/configure.ac =================================================================== --- trunk/yast/ka/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ka/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-kavtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-kavtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-kavtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/km/Makefile.am =================================================================== --- trunk/yast/km/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/km/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/km/configure.ac =================================================================== --- trunk/yast/km/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/km/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-kmvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-kmvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-kmvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/kn/Makefile.am =================================================================== --- trunk/yast/kn/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/kn/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/kn/configure.ac =================================================================== --- trunk/yast/kn/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/kn/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-knvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-knvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-knvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ko/Makefile.am =================================================================== --- trunk/yast/ko/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ko/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ko/configure.ac =================================================================== --- trunk/yast/ko/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ko/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-kovtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-kovtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-kovtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ku/Makefile.am =================================================================== --- trunk/yast/ku/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ku/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ku/configure.ac =================================================================== --- trunk/yast/ku/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ku/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -1,6 +1,6 @@ dnl configure.ac for yast2-trans-ku dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) AC_INIT(yast2-trans-ku, 3.1.0, http://bugs.opensuse.org/, yast2-trans-ku) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="" +VERSION="3.1.0" RPMNAME="yast2-trans-ku" MAINTAINER="Karl Eichwalder <ke@suse.de>" @@ -47,8 +47,6 @@ clientdir=${yast2dir}/clients moduledir=${yast2dir}/modules yncludedir=${yast2dir}/include -ylibdir=${yast2dir}/lib -controldir=${yast2dir}/control schemadir=${yast2dir}/schema scrconfdir=${yast2dir}/scrconf desktopdir=\${prefix}/share/applications/YaST2 @@ -79,8 +77,6 @@ AC_SUBST(clientdir) AC_SUBST(moduledir) AC_SUBST(yncludedir) -AC_SUBST(ylibdir) -AC_SUBST(controldir) AC_SUBST(schemadir) AC_SUBST(scrconfdir) AC_SUBST(agentdir) @@ -140,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-kuvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-kuvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-kuvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) @@ -153,9 +149,13 @@ STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl STYLESHEET_CSS=${dbdir}/css/yast2docs.css +STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl +STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl AC_SUBST(STYLESHEET_HTML) AC_SUBST(STYLESHEET_PDF) AC_SUBST(STYLESHEET_CSS) +AC_SUBST(STYLESHEET_YDOC) +AC_SUBST(STYLESHEET_YCPDOC) dnl searches for some needed programs Modified: trunk/yast/lo/Makefile.am =================================================================== --- trunk/yast/lo/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/lo/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/lo/configure.ac =================================================================== --- trunk/yast/lo/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/lo/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-lovtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-lovtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-lovtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/lt/Makefile.am =================================================================== --- trunk/yast/lt/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/lt/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/lt/configure.ac =================================================================== --- trunk/yast/lt/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/lt/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -1,4 +1,4 @@ -dnl configure.ac for yast2-trans-de +dnl configure.ac for yast2-trans-lt dnl dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-ltvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-ltvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-ltvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/lv/Makefile.am =================================================================== --- trunk/yast/lv/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/lv/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/lv/configure.ac =================================================================== --- trunk/yast/lv/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/lv/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-lvvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-lvvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-lvvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/mk/Makefile.am =================================================================== --- trunk/yast/mk/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/mk/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/mk/configure.ac =================================================================== --- trunk/yast/mk/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/mk/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-mkvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-mkvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-mkvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/mr/Makefile.am =================================================================== --- trunk/yast/mr/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/mr/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/mr/configure.ac =================================================================== --- trunk/yast/mr/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/mr/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-mrvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-mrvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-mrvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ms/Makefile.am =================================================================== --- trunk/yast/ms/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ms/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ms/configure.ac =================================================================== --- trunk/yast/ms/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ms/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-msvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-msvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-msvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/my/Makefile.am =================================================================== --- trunk/yast/my/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/my/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/my/configure.ac =================================================================== --- trunk/yast/my/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/my/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-myvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-myvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-myvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/nb/Makefile.am =================================================================== --- trunk/yast/nb/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/nb/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/nb/configure.ac =================================================================== --- trunk/yast/nb/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/nb/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-nbvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-nbvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-nbvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/nds/Makefile.am =================================================================== --- trunk/yast/nds/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/nds/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/nds/configure.ac =================================================================== --- trunk/yast/nds/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/nds/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-ndsvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-ndsvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-ndsvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ne/Makefile.am =================================================================== --- trunk/yast/ne/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ne/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ne/configure.ac =================================================================== --- trunk/yast/ne/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ne/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-nevtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-nevtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-nevtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/nl/Makefile.am =================================================================== --- trunk/yast/nl/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/nl/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/nl/configure.ac =================================================================== --- trunk/yast/nl/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/nl/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-nlvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-nlvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-nlvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/nn/Makefile.am =================================================================== --- trunk/yast/nn/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/nn/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/nn/configure.ac =================================================================== --- trunk/yast/nn/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/nn/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-nnvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-nnvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-nnvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/pa/Makefile.am =================================================================== --- trunk/yast/pa/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/pa/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/pa/configure.ac =================================================================== --- trunk/yast/pa/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/pa/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-pavtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-pavtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-pavtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/pl/Makefile.am =================================================================== --- trunk/yast/pl/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/pl/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/pl/configure.ac =================================================================== --- trunk/yast/pl/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/pl/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-plvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-plvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-plvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ps/Makefile.am =================================================================== --- trunk/yast/ps/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ps/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ps/configure.ac =================================================================== --- trunk/yast/ps/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ps/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-psvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-psvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-psvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/pt/Makefile.am =================================================================== --- trunk/yast/pt/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/pt/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/pt/configure.ac =================================================================== --- trunk/yast/pt/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/pt/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-ptvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-ptvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-ptvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/pt_BR/Makefile.am =================================================================== --- trunk/yast/pt_BR/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/pt_BR/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/pt_BR/configure.ac =================================================================== --- trunk/yast/pt_BR/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/pt_BR/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-pt_BRvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-pt_BRvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-pt_BRvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ro/Makefile.am =================================================================== --- trunk/yast/ro/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ro/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ro/configure.ac =================================================================== --- trunk/yast/ro/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ro/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-rovtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-rovtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-rovtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ru/Makefile.am =================================================================== --- trunk/yast/ru/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ru/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ru/configure.ac =================================================================== --- trunk/yast/ru/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ru/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-ruvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-ruvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-ruvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/si/Makefile.am =================================================================== --- trunk/yast/si/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/si/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/si/configure.ac =================================================================== --- trunk/yast/si/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/si/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-sivtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-sivtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-sivtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/sk/Makefile.am =================================================================== --- trunk/yast/sk/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sk/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/sk/configure.ac =================================================================== --- trunk/yast/sk/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sk/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-skvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-skvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-skvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/sl/Makefile.am =================================================================== --- trunk/yast/sl/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sl/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/sl/configure.ac =================================================================== --- trunk/yast/sl/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sl/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-slvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-slvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-slvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/sq/Makefile.am =================================================================== --- trunk/yast/sq/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sq/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/sq/configure.ac =================================================================== --- trunk/yast/sq/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sq/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-sqvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-sqvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-sqvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/sr/Makefile.am =================================================================== --- trunk/yast/sr/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sr/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/sr/configure.ac =================================================================== --- trunk/yast/sr/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sr/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-srvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-srvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-srvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/sv/Makefile.am =================================================================== --- trunk/yast/sv/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sv/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/sv/configure.ac =================================================================== --- trunk/yast/sv/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sv/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-svvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-svvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-svvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/sw/Makefile.am =================================================================== --- trunk/yast/sw/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sw/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/sw/configure.ac =================================================================== --- trunk/yast/sw/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/sw/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-swvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-swvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-swvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/ta/Makefile.am =================================================================== --- trunk/yast/ta/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ta/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/ta/configure.ac =================================================================== --- trunk/yast/ta/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/ta/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-tavtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-tavtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-tavtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/tg/Makefile.am =================================================================== --- trunk/yast/tg/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/tg/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/tg/configure.ac =================================================================== --- trunk/yast/tg/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/tg/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-tgvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-tgvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-tgvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/th/Makefile.am =================================================================== --- trunk/yast/th/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/th/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/th/configure.ac =================================================================== --- trunk/yast/th/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/th/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-thvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-thvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-thvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/tk/Makefile.am =================================================================== --- trunk/yast/tk/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/tk/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/tk/configure.ac =================================================================== --- trunk/yast/tk/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/tk/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-tkvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-tkvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-tkvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/tr/Makefile.am =================================================================== --- trunk/yast/tr/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/tr/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/tr/configure.ac =================================================================== --- trunk/yast/tr/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/tr/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-trvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-trvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-trvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/uk/Makefile.am =================================================================== --- trunk/yast/uk/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/uk/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/uk/configure.ac =================================================================== --- trunk/yast/uk/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/uk/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-ukvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-ukvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-ukvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/vi/Makefile.am =================================================================== --- trunk/yast/vi/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/vi/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/vi/configure.ac =================================================================== --- trunk/yast/vi/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/vi/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-vivtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-vivtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-vivtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/wa/Makefile.am =================================================================== --- trunk/yast/wa/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/wa/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/wa/configure.ac =================================================================== --- trunk/yast/wa/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/wa/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-wavtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-wavtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-wavtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/xh/Makefile.am =================================================================== --- trunk/yast/xh/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/xh/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/xh/configure.ac =================================================================== --- trunk/yast/xh/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/xh/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-xhvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-xhvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-xhvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/zh_CN/Makefile.am =================================================================== --- trunk/yast/zh_CN/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/zh_CN/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/zh_CN/configure.ac =================================================================== --- trunk/yast/zh_CN/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/zh_CN/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-zh_CNvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-zh_CNvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-zh_CNvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/zh_TW/Makefile.am =================================================================== --- trunk/yast/zh_TW/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/zh_TW/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/zh_TW/configure.ac =================================================================== --- trunk/yast/zh_TW/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/zh_TW/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-zh_TWvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-zh_TWvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-zh_TWvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) Modified: trunk/yast/zu/Makefile.am =================================================================== --- trunk/yast/zu/Makefile.am 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/zu/Makefile.am 2015-11-11 09:20:18 UTC (rev 94823) @@ -14,29 +14,22 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) +COPYRIGHT_files = COPYING +doc_DATA = $(COPYRIGHT_files) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -COPYRIGHT_files_gpl = README COPYING - -COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ - COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish - -extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./build-tools; then echo ./build-tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common +Makefile.am.common: $(DEVTOOLS_DIR)/build-tools/Makefile.am.common cmp -s $< $@ || cp -f $< $@ # create bzip2ed tar and make some sanity checks @@ -53,7 +46,8 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + VERSION RPMNAME MAINTAINER configure.in.in \ + $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) @@ -78,22 +72,6 @@ EXTRA_DIST += $(RPMNAME).pc.in endif -dist-hook: - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $$LEGALESE_DIR/"; \ - exit 1 ; \ - fi ; \ - echo "cp $$EX $(distdir)" ; \ - cp $$EX "$(distdir)" ; \ - done - pot: $(Y2TOOL) y2makepot -s $(srcdir) @@ -120,23 +98,6 @@ # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) -install-data-local: # $(if $(IS_DEVTOOLS),,install-pot) - mkdir -p $(DESTDIR)$(docdir) - @for I in $(extra_COPYRIGHT_files) ; \ - do \ - EX="" ; \ - if test -f $(srcdir)/$$I ; then \ - EX=$(srcdir)/$$I ; \ - elif test -f $(LEGALESE_DIR)/$$I ; then \ - EX=$(LEGALESE_DIR)/$$I ; \ - else \ - echo "Error: No file $$I in $(srcdir)/ or in $(LEGALESE_DIR)/"; \ - exit 1 ; \ - fi ; \ - echo "$(INSTALL_DATA) $$EX $(DESTDIR)$(docdir)" ; \ - $(INSTALL_DATA) $$EX $(DESTDIR)$(docdir) ; \ - done - package-local: check-parse $(if $(IS_DEVTOOLS),,$(POT_DST)) $(RPMNAME)-$(VERSION).tar.bz2 rm -f package/$(RPMNAME)-*.tar.bz2 rm -f package/*~ @@ -150,8 +111,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local Modified: trunk/yast/zu/configure.ac =================================================================== --- trunk/yast/zu/configure.ac 2015-11-10 20:59:12 UTC (rev 94822) +++ trunk/yast/zu/configure.ac 2015-11-11 09:20:18 UTC (rev 94823) @@ -136,10 +136,10 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-zuvtools` AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-zuvtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-zuvtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)