Attachment #125451 for bug #185972

View | Details | Raw Unified | Return to bug 185972
Collapse All | Expand All

Lines 38-47 Link Here

(-)IcePy-3.2.0-orig/Makefile (-2 / +3 lines)
38	echo "making $@ in $$subdir"; \	38	echo "making $@ in $$subdir"; \
39	( cd $$subdir && $(MAKE) $@ ) \|\| exit 1; \	39	( cd $$subdir && $(MAKE) $@ ) \|\| exit 1; \
40	done	40	done
41		41
42	install::	42	install::
43	$(call installdata,ICE_LICENSE,$(prefix))	43	mkdir -p $(install_slicedir)
44	$(call installdata,LICENSE,$(prefix))	44	$(call installdata,ICE_LICENSE,$(install_slicedir))
		45	$(call installdata,LICENSE,$(install_slicedir))
45		46
46	test::	47	test::
47	@python $(top_srcdir)/allTests.py	48	@python $(top_srcdir)/allTests.py




#
# Select an installation base directory. The directory will be created
# if it does not exist.
#

prefix			= $(DESTDIR)/usr

#
# The "root directory" for runpath embedded in executables. Can be unset
# to avoid adding a runpath to Ice executables.
#
#embedded_runpath_prefix  ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)

#
# Define OPTIMIZE as yes if you want to build with optimization.
# Otherwise the Ice extension is built with debug information.
#

VERSION_MINOR           = 2
VERSION			= 3.2.0
SOVERSION		= 32
libdir			= $(top_srcdir)/python

install_slicedir	= $(prefix)/share/icepy-$(VERSION)/slice
install_pythondir	= $(prefix)/lib/$(PYTHON_VERSION)/site-packages

INSTALL			= cp -fp
INSTALL_PROGRAM		= ${INSTALL}
INSTALL_LIBRARY		= ${INSTALL}
INSTALL_DATA		= ${INSTALL}

endif

ifneq ($(ICE_HOME),)
    slicedir		= $(ICE_HOME)/slice
else
    slicedir		= /usr/share/Ice/slice
endif

install_libdir	        = $(prefix)/lib

#ifneq ($(embedded_runpath_prefix),)
#   ifeq ($(LP64),yes)
#       runpath_libdir	  := $(embedded_runpath_prefix)/lib$(lp64suffix)
#   else
#       runpath_libdir	  := $(embedded_runpath_prefix)/lib
#   endif
#endif

CPPFLAGS		=
ICECPPFLAGS		= -I$(slicedir)
SLICE2PYFLAGS		= $(ICECPPFLAGS)


    installprogram	= $(INSTALL_PROGRAM) $(1) $(2); \
			  chmod a+rx $(2)/$(notdir $(1))
endif

ifeq ($(mkdir),)
    mkdir		= mkdir -p $(1) ; \
			  chmod a+rx $(1)
endif

#
# A Python extension library cannot have a "lib" prefix, so Python-specific

Lines 51-57 Link Here

(-)IcePy-3.2.0-orig/modules/IcePy/Makefile (+1 lines)
51	rm -f $@	51	rm -f $@
52	ln -s $(SONAME) $@	52	ln -s $(SONAME) $@
53		53
54	install:: all	54	install:: all
55	$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))	55	$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
		56	ln -s $(install_libdir)/$(SONAME) $(install_pythondir)/$(LIBNAME)
56		57
57	include .depend	58	include .depend

Return to bug 185972

Lines 16-32 Link Here

(-)IcePy-3.2.0-orig/config/Make.rules (-14 / +14 lines)
16	#	16	#
17	# Select an installation base directory. The directory will be created	17	# Select an installation base directory. The directory will be created
18	# if it does not exist.	18	# if it does not exist.
19	#	19	#
20		20
21	prefix = /opt/IcePy-$(VERSION)	21	prefix = $(DESTDIR)/usr
22		22
23	#	23	#
24	# The "root directory" for runpath embedded in executables. Can be unset	24	# The "root directory" for runpath embedded in executables. Can be unset
25	# to avoid adding a runpath to Ice executables.	25	# to avoid adding a runpath to Ice executables.
26	#	26	#
27	embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)	27	#embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
28		28
29	#	29	#
30	# Define OPTIMIZE as yes if you want to build with optimization.	30	# Define OPTIMIZE as yes if you want to build with optimization.
31	# Otherwise the Ice extension is built with debug information.	31	# Otherwise the Ice extension is built with debug information.
32	#	32	#
Lines 99-110 Link Here
99	VERSION_MINOR = 2	99	VERSION_MINOR = 2
100	VERSION = 3.2.0	100	VERSION = 3.2.0
101	SOVERSION = 32	101	SOVERSION = 32
102	libdir = $(top_srcdir)/python	102	libdir = $(top_srcdir)/python
103		103
104	install_slicedir = $(prefix)/slice	104	install_slicedir = $(prefix)/share/icepy-$(VERSION)/slice
105	install_pythondir = $(prefix)/python	105	install_pythondir = $(prefix)/lib/$(PYTHON_VERSION)/site-packages
106		106
107	INSTALL = cp -fp	107	INSTALL = cp -fp
108	INSTALL_PROGRAM = ${INSTALL}	108	INSTALL_PROGRAM = ${INSTALL}
109	INSTALL_LIBRARY = ${INSTALL}	109	INSTALL_LIBRARY = ${INSTALL}
110	INSTALL_DATA = ${INSTALL}	110	INSTALL_DATA = ${INSTALL}
Lines 136-157 Link Here
136	endif	136	endif
137		137
138	ifneq ($(ICE_HOME),)	138	ifneq ($(ICE_HOME),)
139	slicedir = $(ICE_HOME)/slice	139	slicedir = $(ICE_HOME)/slice
140	else	140	else
141	slicedir = /usr/share/Ice-$(VERSION)/slice	141	slicedir = /usr/share/Ice/slice
142	endif	142	endif
143		143
144	install_libdir = $(prefix)/python	144	install_libdir = $(prefix)/lib
145		145
146	ifneq ($(embedded_runpath_prefix),)	146	#ifneq ($(embedded_runpath_prefix),)
147	ifeq ($(LP64),yes)	147	# ifeq ($(LP64),yes)
148	runpath_libdir := $(embedded_runpath_prefix)/lib$(lp64suffix)	148	# runpath_libdir := $(embedded_runpath_prefix)/lib$(lp64suffix)
149	else	149	# else
150	runpath_libdir := $(embedded_runpath_prefix)/lib	150	# runpath_libdir := $(embedded_runpath_prefix)/lib
151	endif	151	# endif
152	endif	152	#endif
153		153
154	CPPFLAGS =	154	CPPFLAGS =
155	ICECPPFLAGS = -I$(slicedir)	155	ICECPPFLAGS = -I$(slicedir)
156	SLICE2PYFLAGS = $(ICECPPFLAGS)	156	SLICE2PYFLAGS = $(ICECPPFLAGS)
157		157
Lines 198-208 Link Here
198	installprogram = $(INSTALL_PROGRAM) $(1) $(2); \	198	installprogram = $(INSTALL_PROGRAM) $(1) $(2); \
199	chmod a+rx $(2)/$(notdir $(1))	199	chmod a+rx $(2)/$(notdir $(1))
200	endif	200	endif
201		201
202	ifeq ($(mkdir),)	202	ifeq ($(mkdir),)
203	mkdir = mkdir $(1) ; \	203	mkdir = mkdir -p $(1) ; \
204	chmod a+rx $(1)	204	chmod a+rx $(1)
205	endif	205	endif
206		206
207	#	207	#
208	# A Python extension library cannot have a "lib" prefix, so Python-specific	208	# A Python extension library cannot have a "lib" prefix, so Python-specific