[packages/h323plus: 5/8] - set up sane paths

[baggins]

commit da7dd042b34173fb8a72dd93bd77de24629cff37
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 17 15:36:43 2012 +0100

    - set up sane paths

 h323plus-mak-paths.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
---
diff --git a/h323plus-mak-paths.patch b/h323plus-mak-paths.patch
new file mode 100644
index 0000000..906bdb5
--- /dev/null
+++ b/h323plus-mak-paths.patch
@@ -0,0 +1,60 @@
+--- h323plus/openh323u.mak.in~	2011-09-01 05:15:08.000000000 +0200
++++ h323plus/openh323u.mak.in	2012-11-17 13:12:41.416098151 +0100
+@@ -25,9 +25,9 @@
+ #
+ 
+ PTLIBDIR	= @PTLIBDIR@
+ ifndef OPENH323DIR
+-OPENH323DIR	= @OPENH323DIR@
++OPENH323DIR	= @prefix@
+ endif
+ STDCCFLAGS	+= @STDCCFLAGS@
+ LDFLAGS		+= @LDFLAGS@
+ LDLIBS		+= @LDLIBS@
+@@ -65,20 +64,18 @@
+ include $(PTLIBDIR)/make/ptlib.mak
+ endif # LIBRARY_MAKEFILE
+ 
+-LIBDIRS += $(OPENH323DIR)
+-
+ #OH323_SUPPRESS_H235	= 1
+ 
+ OH323_SRCDIR = $(OPENH323DIR)/src
+-ifdef PREFIX
+-OH323_INCDIR = $(PREFIX)/include/openh323
++ifndef OH323_INCDIR
++OH323_INCDIR = @includedir@/openh323
+-else
+-OH323_INCDIR = $(OPENH323DIR)/include
+-endif # PREFIX
++endif # OH323_INCDIR
+ 
+ ifndef OH323_LIBDIR
+-OH323_LIBDIR = $(OPENH323DIR)/lib
++OH323_LIBDIR = @libdir@
+ endif # OH323_LIBDIR
++
++LIBDIRS += $(OH323_LIBDIR)
+ 
+ ifeq ($(NOTRACE), 1)
+ STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
+@@ -89,7 +89,7 @@
+ OH323_SUFFIX = $(OBJ_SUFFIX)
+ endif # NOTRACE
+ 
+-OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
++OH323_BASE  = h323
+ OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
+ 
+ LDFLAGS	    += -L$(OH323_LIBDIR)
+--- h323plus/Makefile.in~	2011-09-10 06:31:33.000000000 +0200
++++ h323plus/Makefile.in	2012-11-17 13:34:23.042718902 +0100
+@@ -86,7 +86,7 @@
+ install:
+ 	mkdir -p $(DESTDIR)$(LIBDIR)
+ 	rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
+-	$(INSTALL) -m 444 lib/$(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 444 $(OH323_LIBDIR)/$(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
+ 	(cd $(DESTDIR)$(LIBDIR) ; \
+ 		rm -f  $(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@ ; \
+ 		ln -sf $(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@ \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/h323plus.git/commitdiff/80a03e028e264835f927118d78091e61e180d860