updated build system
This commit is contained in:
		| @@ -14,6 +14,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], | ||||
|       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" | ||||
|       for path in . .. ../.. ../../..; do | ||||
|         if test -d .svn; then | ||||
|           svn upgrade 1>&2 > /dev/null || true | ||||
|           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') | ||||
|           if test -n "${VCS_REVISION}"; then break; fi | ||||
|         elif test -d .git; then | ||||
| @@ -26,6 +27,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], | ||||
|       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" | ||||
|       for path in . .. ../.. ../../..; do | ||||
|         if test -d .svn; then | ||||
|           svn upgrade 1>&2 > /dev/null || true | ||||
|           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') | ||||
|           if test -n "${VCS_REVISION}"; then break; fi | ||||
|         elif test -d .git; then | ||||
| @@ -46,6 +48,7 @@ m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([ | ||||
|   VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" | ||||
|   for path in . .. ../.. ../../..; do | ||||
|     if test -d .svn; then | ||||
|       svn upgrade 1>&2 > /dev/null || true | ||||
|       VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') | ||||
|       if test -n "${VCS_REVISION}"; then break; fi | ||||
|     elif test -d .git; then | ||||
|   | ||||
| @@ -189,9 +189,9 @@ case $mode in | ||||
|     (apt) | ||||
|         OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends' | ||||
|         for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do | ||||
|             docker exec -it ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences" | ||||
|             docker exec -it ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences" | ||||
|             docker exec -it ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" | ||||
|             docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences" | ||||
|             docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences" | ||||
|             docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" | ||||
|         done | ||||
|         docker exec ${DOCKER_ID} apt-get update ${OPTIONS} | ||||
|         docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} | ||||
|   | ||||
							
								
								
									
										13
									
								
								scripts/makefile.am
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								scripts/makefile.am
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,13 @@ | ||||
| ## @id $Id$ | ||||
| ## | ||||
| ## This file has been added: | ||||
| ##  - by bootstrap.sh | ||||
| ##  -  on Thu, 05 May 2016 12:08:23 +0200 | ||||
| ## Feel free to change it or even remove and rebuild it, up to your needs | ||||
| ## | ||||
| ##       1         2         3         4         5         6         7         8 | ||||
| ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 | ||||
|  | ||||
| dist_bin_SCRIPTS = | ||||
|  | ||||
| MAINTAINERCLEANFILES = makefile.in | ||||
		Reference in New Issue
	
	Block a user