bugfix new buildsystem: makefile.in is in top_srcdir
This commit is contained in:
		
							
								
								
									
										19
									
								
								ChangeLog
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								ChangeLog
									
									
									
									
									
								
							| @@ -1,3 +1,22 @@ | |||||||
|  | 2015-03-05 14:48  marc | ||||||
|  |  | ||||||
|  | 	* debian/control.in: uic is required if qt is used | ||||||
|  |  | ||||||
|  | 2015-03-05 14:05  marc | ||||||
|  |  | ||||||
|  | 	* ChangeLog, m4/ax_check_qt.m4: don't stop if qt is not found; more | ||||||
|  | 	  elegant way for adding qt rules | ||||||
|  |  | ||||||
|  | 2015-03-05 13:44  marc | ||||||
|  |  | ||||||
|  | 	* m4/ax_check_qt.m4: don't stop if qt is not found; more elegant | ||||||
|  | 	  way for adding qt rules | ||||||
|  |  | ||||||
|  | 2015-03-05 13:27  marc | ||||||
|  |  | ||||||
|  | 	* m4/ax_check_qt.m4: don't stop if qt is not found; more elegant | ||||||
|  | 	  way for adding qt rules | ||||||
|  |  | ||||||
| 2015-03-05 13:21  marc | 2015-03-05 13:21  marc | ||||||
|  |  | ||||||
| 	* m4/ax_check_qt.m4, src/makefile.am: don't stop if qt is not | 	* m4/ax_check_qt.m4, src/makefile.am: don't stop if qt is not | ||||||
|   | |||||||
| @@ -39,9 +39,9 @@ dnl refers to ${prefix}.  Thus we have to use `eval' twice. | |||||||
|  |  | ||||||
| AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ | AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ | ||||||
|   sh_add_makefile_target_dep() { |   sh_add_makefile_target_dep() { | ||||||
|     sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${3}" |     sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${top_srcdir}/${3}" | ||||||
|     if ! egrep -q "${1}:.* ${2}" "${3}"; then |     if ! egrep -q "${1}:.* ${2}" "${top_srcdir}/${3}"; then | ||||||
|         echo "${1}: ${2}" >> "${3}" |         echo "${1}: ${2}" >> "${top_srcdir}/${3}" | ||||||
|     fi |     fi | ||||||
|   } |   } | ||||||
|   sh_add_makefile_target_dep "$1" "$2" "$3" |   sh_add_makefile_target_dep "$1" "$2" "$3" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user