Attachment #152363 for bug #155974

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

and this patch




all: resources

install:
	#cp -rf @top_srcdir@/adm_local @prefix@

bin:

resources :
	#cp -rf @top_srcdir@/adm_local $(top_builddir)

inc:


Lines 62-69 Link Here

(-)src3.2.6.orig/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in (-3 / +5 lines)
62	PYTHON_INCLUDES = @PYTHON_INCLUDES@	62	PYTHON_INCLUDES = @PYTHON_INCLUDES@
63	PYTHON_LIBS = @PYTHON_LIBS@	63	PYTHON_LIBS = @PYTHON_LIBS@
64	PYTHON_VERSION = @PYTHON_VERSION@	64	PYTHON_VERSION = @PYTHON_VERSION@
65	PYTHON_SITE = @PYTHON_SITE@	65	#PYTHON_SITE = @PYTHON_SITE@
66	PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@	66	#PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
		67	PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages
		68	PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome
67		69
68	# QT	70	# QT
69		71
Lines 219-225 Link Here
219	includedir=@includedir@/salome	221	includedir=@includedir@/salome
220	datadir=@datadir@/salome	222	datadir=@datadir@/salome
221	idldir=$(prefix)/idl/salome	223	idldir=$(prefix)/idl/salome
222	sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules	224	sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
223		225
224	docdir=${prefix}/doc/salome	226	docdir=${prefix}/doc/salome
225		227

Lines 142-148 Link Here

(-)src3.2.6.orig/NETGENPLUGIN_SRC_3.2.6/build_configure (-1 / +1 lines)
142		142
143	# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files	143	# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
144	echo "" >> configure.in_tmp1	144	echo "" >> configure.in_tmp1
145	echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1	145	echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
146		146
147	echo "" >> configure.in_tmp1	147	echo "" >> configure.in_tmp1
148	echo "AC_OUTPUT([ \\" >> configure.in_tmp1	148	echo "AC_OUTPUT([ \\" >> configure.in_tmp1

Return to bug 155974

Lines 27-38 Link Here

(-)src3.2.6.orig/NETGENPLUGIN_SRC_3.2.6/adm_local/Makefile.in (-2 / +2 lines)
27	all: resources	27	all: resources
28		28
29	install:	29	install:
30	cp -rf @top_srcdir@/adm_local @prefix@	30	#cp -rf @top_srcdir@/adm_local @prefix@
31		31
32	bin:	32	bin:
33		33
34	resources :	34	resources :
35	cp -rf @top_srcdir@/adm_local $(top_builddir)	35	#cp -rf @top_srcdir@/adm_local $(top_builddir)
36		36
37	inc:	37	inc:
38		38