[packages/opal.git] / opal-mak_files.patch

diff -ur opal-2.2.8/opal_inc.mak.in opal-2.2.8-mak/opal_inc.mak.in
--- opal-2.2.8/opal_inc.mak.in	2007-04-18 19:16:36.345473082 +0200
+++ opal-2.2.8-mak/opal_inc.mak.in	2007-04-18 19:17:46.448447452 +0200
@@ -67,7 +67,9 @@
 HAS_SANGOMA=@HAS_SANGOMA@
 
 
-OPALDIR=@OPALDIR@
+ifndef OPALDIR
+OPALDIR     = /usr
+endif
 PWLIBDIR=@PWLIBDIR@
 
 LIBDIRS += $(OPALDIR)
@@ -106,7 +108,7 @@
 OPAL_BASE  = opal
 OPAL_FILE  = lib$(OPAL_BASE).$(LIB_SUFFIX)
 
-LDFLAGS	    += -L$(OPAL_LIBDIR)
+LDFLAGS	    := -L$(OPAL_LIBDIR) $(LDFLAGS)
 LDLIBS	    := -l$(OPAL_BASE) $(LDLIBS)
 
 STDCCFLAGS  += -I$(OPAL_INCDIR)
@@ -114,6 +116,7 @@
 
 $(TARGET) :	$(OPAL_LIBDIR)/$(OPAL_FILE)
 
+ifdef OPAL_BUILD
 ifndef LIBRARY_MAKEFILE
 
 ifdef DEBUG
@@ -127,6 +130,7 @@
 libs :: $(OPAL_LIBDIR)/$(OPAL_FILE)
 
 endif
+endif
 
 
 # End of file
Commit	Line	Data
73c0db2b	1	diff -ur opal-2.2.8/opal_inc.mak.in opal-2.2.8-mak/opal_inc.mak.in
	2	--- opal-2.2.8/opal_inc.mak.in 2007-04-18 19:16:36.345473082 +0200
	3	+++ opal-2.2.8-mak/opal_inc.mak.in 2007-04-18 19:17:46.448447452 +0200
f358b61b	4	@@ -67,7 +67,9 @@
0a0e4a8d JR	5	HAS_SANGOMA=@HAS_SANGOMA@
	6
	7
	8	-OPALDIR=@OPALDIR@
	9	+ifndef OPALDIR
	10	+OPALDIR = /usr
	11	+endif
	12	PWLIBDIR=@PWLIBDIR@
0a0e4a8d JR	13
0a0e4a8d JR	14	LIBDIRS += $(OPALDIR)
73c0db2b	15	@@ -106,7 +108,7 @@
	16	OPAL_BASE = opal
	17	OPAL_FILE = lib$(OPAL_BASE).$(LIB_SUFFIX)
	18
	19	-LDFLAGS += -L$(OPAL_LIBDIR)
	20	+LDFLAGS := -L$(OPAL_LIBDIR) $(LDFLAGS)
	21	LDLIBS := -l$(OPAL_BASE) $(LDLIBS)
	22
	23	STDCCFLAGS += -I$(OPAL_INCDIR)
	24	@@ -114,6 +116,7 @@
0a0e4a8d JR	25
	26	$(TARGET) : $(OPAL_LIBDIR)/$(OPAL_FILE)
	27
	28	+ifdef OPAL_BUILD
	29	ifndef LIBRARY_MAKEFILE
	30
	31	ifdef DEBUG
73c0db2b	32	@@ -127,6 +130,7 @@
0a0e4a8d JR	33	libs :: $(OPAL_LIBDIR)/$(OPAL_FILE)
	34
	35	endif
	36	+endif
	37
	38
	39	# End of file