Attachment #168560 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch




@COMMENCE@

usr_docs:
#	cp -fr $(srcdir)/GUI ./
	-find $(PWD) -name CVS -prune -exec rm -rf {} \;

docs: usr_docs
++ ./GUI_SRC_3.2.6/adm_local/Makefile.in 2007-09-26 23:23:59.000000000 +0200

all: resources
install:
#	cp -rf @top_srcdir@/adm_local @prefix@
bin:
resources :
#	cp -rf @top_srcdir@/adm_local $(top_builddir)
inc:
++ ./GUI_SRC_3.2.6/build_configure       2007-05-26 12:29:53.000000000 +0200

# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
echo "" >> configure.in_tmp1
echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
echo  "" >> configure.in_tmp1
echo "AC_OUTPUT([ \\" >> configure.in_tmp1

Lines 50-55 Link Here

(-)./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4.org (+4 lines)
50	SIP_VERS=v4_new ;;	50	SIP_VERS=v4_new ;;
51	4.5*)	51	4.5*)
52	SIP_VERS=v4_new ;;	52	SIP_VERS=v4_new ;;
		53	4.6*)
		54	SIP_VERS=v4_new ;;
		55	4.7*)
		56	SIP_VERS=v4_new ;;
53	*)	57	*)
54	AC_MSG_RESULT(sip version $version not supported)	58	AC_MSG_RESULT(sip version $version not supported)
55	SIP_VERS=unsupported ;;	59	SIP_VERS=unsupported ;;

Lines 41-46 Link Here

(-)./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in.org (+6 lines)
41	ifeq ($(QT_VERS),Qt_3_3_7)	41	ifeq ($(QT_VERS),Qt_3_3_7)
42	QT_VERS = Qt_3_3_0	42	QT_VERS = Qt_3_3_0
43	endif	43	endif
		44	ifeq ($(QT_VERS),Qt_3_3_8)
		45	QT_VERS = Qt_3_3_0
		46	endif
		47	ifeq ($(QT_VERS),Qt_3_3_8b)
		48	QT_VERS = Qt_3_3_6
		49	endif
44		50
45	# Sip flags	51	# Sip flags
46	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)	52	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)

Lines 44-49 Link Here

(-)./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in.org (+8 lines)
44	QT_VERS = Qt_3_3_0	44	QT_VERS = Qt_3_3_0
45	endif	45	endif
46		46
		47	ifeq ($(QT_VERS),Qt_3_3_8)
		48	QT_VERS = Qt_3_3_0
		49	endif
		50
		51	ifeq ($(QT_VERS),Qt_3_3_8b)
		52	QT_VERS = Qt_3_3_6
		53	endif
		54
47	# Sip flags	55	# Sip flags
48	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)	56	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
49		57

Return to bug 155974

Lines 28-34 Link Here

(-)GUI_SRC_3.2.6/doc/salome/gui/Makefile.in.org (-6 / +6 lines)
28	@COMMENCE@	28	@COMMENCE@
29		29
30	usr_docs:	30	usr_docs:
31	cp -fr $(srcdir)/GUI ./	31	# cp -fr $(srcdir)/GUI ./
32	-find $(PWD) -name CVS -prune -exec rm -rf {} \;	32	-find $(PWD) -name CVS -prune -exec rm -rf {} \;
33		33
34	docs: usr_docs	34	docs: usr_docs
35	-- ./GUI_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200	35	++ ./GUI_SRC_3.2.6/adm_local/Makefile.in 2007-09-26 23:23:59.000000000 +0200
Lines 26-37 Link Here
26	all: resources	26	all: resources
27	install:	27	install:
28	cp -rf @top_srcdir@/adm_local @prefix@	28	# cp -rf @top_srcdir@/adm_local @prefix@
29	bin:	29	bin:
30	resources :	30	resources :
31	cp -rf @top_srcdir@/adm_local $(top_builddir)	31	# cp -rf @top_srcdir@/adm_local $(top_builddir)
32	inc:	32	inc:
33	-- ./GUI_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200	33	++ ./GUI_SRC_3.2.6/build_configure 2007-05-26 12:29:53.000000000 +0200
Lines 109-115 Link Here
109	# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files	109	# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
110	echo "" >> configure.in_tmp1	110	echo "" >> configure.in_tmp1
111	echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1	111	echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
112	echo "" >> configure.in_tmp1	112	echo "" >> configure.in_tmp1
113	echo "AC_OUTPUT([ \\" >> configure.in_tmp1	113	echo "AC_OUTPUT([ \\" >> configure.in_tmp1