1.1 --- a/test/Makefile.am	Mon Sep 01 12:19:32 2014 +0100
     1.2 +++ b/test/Makefile.am	Mon Jul 04 10:48:18 2016 +0100
     1.3 @@ -4,7 +4,7 @@
     1.4  if HAVE_LUA
     1.5    check_SCRIPTS += lua mult-install
     1.6  endif
     1.7 -check_SCRIPTS += order
     1.8 +check_SCRIPTS += order non-ascii relative-root
     1.9  
    1.10  relocate:	relocate.sh primary.xml.gz
    1.11  	cp $(srcdir)/relocate.sh relocate
    1.12 @@ -24,6 +24,12 @@
    1.13  order:	order.sh primary.xml.gz
    1.14  	cp $(srcdir)/order.sh order
    1.15  
    1.16 +non-ascii:	non-ascii.sh primary.xml.gz
    1.17 +	cp $(srcdir)/non-ascii.sh non-ascii
    1.18 +
    1.19 +relative-root:	relative-root.sh primary.xml.gz
    1.20 +	cp $(srcdir)/relative-root.sh relative-root
    1.21 +
    1.22  lua:	lua.sh primary.xml.gz
    1.23  	cp $(srcdir)/lua.sh lua
    1.24  
    1.25 @@ -40,25 +46,26 @@
    1.26  	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh.spec
    1.27  	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh2.spec
    1.28  	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/filesystem.spec
    1.29 -	mkdir -p base/rpms
    1.30 -	mv rpmbuild/RPMS/noarch/*.rpm base/rpms
    1.31 +	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/aljip.spec
    1.32 +	mkdir -p base/Packages
    1.33 +	mv rpmbuild/RPMS/noarch/*.rpm base/Packages
    1.34  	rm -rf rpmbuild
    1.35 -	createrepo --simple-md-filenames -o base base/rpms
    1.36 +	createrepo --simple-md-filenames base
    1.37  
    1.38  updates/repodata/primary.xml.gz:	zip.spec Makefile
    1.39  	rm -rf rpmbuild updates
    1.40  	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
    1.41  	rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version 2" \
    1.42  	  -bb $(srcdir)/zip.spec
    1.43 -	mkdir -p updates/rpms
    1.44 -	mv rpmbuild/RPMS/noarch/*.rpm updates/rpms
    1.45 +	mkdir -p updates/Packages
    1.46 +	mv rpmbuild/RPMS/noarch/*.rpm updates/Packages
    1.47  	rm -rf rpmbuild
    1.48 -	createrepo --simple-md-filenames -o updates updates/rpms
    1.49 +	createrepo --simple-md-filenames updates
    1.50  
    1.51  primary.xml.gz:	base/repodata/primary.xml.gz
    1.52  	cp base/repodata/primary.xml.gz base/repodata/filelists.xml.gz .
    1.53  	rm -rf rpms
    1.54 -	ln -s base/rpms .
    1.55 +	ln -s base/Packages rpms
    1.56  
    1.57  TESTS = $(check_SCRIPTS)
    1.58  
    1.59 @@ -68,7 +75,10 @@
    1.60  	zsh.spec		\
    1.61  	zsh2.spec		\
    1.62  	filesystem.spec		\
    1.63 +	aljip.spec		\
    1.64  	order.sh		\
    1.65 +	non-ascii.sh		\
    1.66 +	relative-root.sh	\
    1.67  	mult-install.sh		\
    1.68  	lua.sh			\
    1.69  	remove.sh		\