Re: [GnomeMeeting-devel-list] Opal "make install" broken



> > Opal's "make install" seems to be broken somehow...
> 
> I noticed this as well and I'm just looking into it myself. It seems
> it would be as a result of a patch that I added to cleanup some of the
> install side of things that Crig applied recently.

Jan,

I've just tried the attched patch at it fixes the problem for me. I'm
using as part of an RPM build so if you want to test it and let me
know how it goes that would be good as my environment might not be
exactly the same as yours.

Regards
Pete
--- opal-2.1.1-new/Makefile.in	2005-04-21 00:11:27.000000000 +0800
+++ opal-2.1.1/Makefile.in	2005-04-21 01:22:47.000000000 +0800
@@ -694,19 +690,10 @@
 test:
 	@echo $(ASN_CXX_FILES)
 
-###############################################################################
+
 #### Install targets
 install:
 	mkdir -p $(DESTDIR)$(LIBDIR)
-	rm -f $(DESTDIR)$(LIBDIR)/libopal_*_r.so*
-	$(INSTALL) -m 644 lib/*_r.so $(DESTDIR)$(LIBDIR)
-	(for fn in lib/*_r.so.* ; do \
-		cd $(DESTDIR)$(LIBDIR) ; \
-		rm -f `basename $$fn` ; \
-		ln -s libopal_*_r.so `basename $$fn` ; \
-	done)
-	$(INSTALL) -m 644 lib/$(OPAL_FILE) $(DESTDIR)$(LIBDIR)
-	( cd $(DESTDIR)$(LIBDIR); rm libopal.so ; ln -s $(OPAL_FILE) libopal.so)
 	( for dir in $(DESTDIR)$(LIBDIR) \
 		     $(DESTDIR)$(PREFIX)/include/opal/asn \
 		     $(DESTDIR)$(PREFIX)/include/opal/codec \
@@ -720,6 +707,13 @@
 		     $(DESTDIR)$(PREFIX)/share/opal ;\
 		do mkdir -p $$dir ; chmod 755 $$dir ; \
 	done)
+	$(INSTALL) -m 755 lib/$(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) $(DESTDIR)$(LIBDIR)
+	ln -snf $(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) \
+		$(DESTDIR)$(LIBDIR)/$(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION)
+	ln -snf $(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) \
+		$(DESTDIR)$(LIBDIR)/$(OPAL_FILE).$(MAJOR_VERSION)
+	ln -snf $(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) \
+		$(DESTDIR)$(LIBDIR)/$(OPAL_FILE)
 	( for fn in include/asn/*.h ; do \
 		$(INSTALL) -m 644 $$fn $(DESTDIR)$(PREFIX)/include/opal/asn ; \
 	done)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]