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

[Peter Robinson <pbrobinson gmail com>]

> > Has it been fixed?
> 
> Hi Jan,
> 
> I'm just testing a fix for it now. Should be compiled within 10
> minutes or so then I'll email it to you for testing.

Ok,

After spending half the day on various possible fixes I think I
finally have it. This works for me in a standard non rpm build
environment. I'm not sure if its the best way to fix the problem but
at this stage it seems to work.

The install_fix3 patch is the main part of the patch. The verfix patch
changes the BUILD_TYPE in version.h from BetaCode to ReleaseCode as
when its set to beta code it does funny things to the library names.
I've got an outstanding query with Craig whether this change is
actually necessary now that we're using an odd/even devel/stable
numbering scheme and so its a hack to easily fix the naming problem
easily until I see if I have to do a proper Makefile if/else statement
to work around this.

Let me know how you go with it, if it works OK I'll forward it to Craig.

Regards
Peter

--- opal-clean/Makefile.in	2005-04-22 00:21:10.000000000 +0800
+++ opal/Makefile.in	2005-04-22 00:23:29.000000000 +0800
@@ -714,13 +714,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)
+	$(INSTALL) -m 755 lib/$(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) $(DESTDIR)$(PREFIX)lib
 	ln -snf $(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) \
-		$(DESTDIR)$(LIBDIR)/$(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION)
+		$(DESTDIR)$(PREFIX)lib/$(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION)
 	ln -snf $(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) \
-		$(DESTDIR)$(LIBDIR)/$(OPAL_FILE).$(MAJOR_VERSION)
+		$(DESTDIR)$(PREFIX)lib/$(OPAL_FILE).$(MAJOR_VERSION)
 	ln -snf $(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER) \
-		$(DESTDIR)$(LIBDIR)/$(OPAL_FILE)
+		$(DESTDIR)$(PREFIX)lib/$(OPAL_FILE)
 	( for fn in include/asn/*.h ; do \
 		$(INSTALL) -m 644 $$fn $(DESTDIR)$(PREFIX)/include/opal/asn ; \
 	done)
@@ -751,10 +751,10 @@
 	$(INSTALL) -m 644 opal_inc.mak $(DESTDIR)$(PREFIX)/share/opal
 
 uninstall:
-	rm -rf $(DESTDIR)$(PREFIX)/include/opal \
-	       $(DESTDIR)$(PREFIX)/share/opal
-	rm -f $(DESTDIR)$(LIBDIR)/$(OPAL_FILE) \
-	      $(DESTDIR)$(LIBDIR)/libopal.so
+	rm -rf $(DESTDIR)$(PREFIX)include/opal \
+	       $(DESTDIR)$(PREFIX)share/opal
+	rm -f $(DESTDIR)$(PREFIX)lib/$(OPAL_FILE)* \
+	      $(DESTDIR)$(PREFIX)lib/libopal.so
 
  
 docs:

--- opal-2.1.0-clean/version.h	2005-02-21 15:12:21.000000000 +0800
+++ opal-2.1.0/version.h	2005-02-21 15:53:20.573765724 +0800
@@ -36,7 +36,7 @@
 
 #define MAJOR_VERSION 2
 #define MINOR_VERSION 1
-#define BUILD_TYPE    BetaCode
+#define BUILD_TYPE    ReleaseCode
 #define BUILD_NUMBER 1