[csw-devel] SF.net SVN: gar:[17926] csw/mgar/pkg/389-admin/trunk

[cgrzemba at users.sourceforge.net]

Revision: 17926
          http://gar.svn.sourceforge.net/gar/?rev=17926&view=rev
Author:   cgrzemba
Date:     2012-05-02 11:38:54 +0000 (Wed, 02 May 2012)
Log Message:
-----------
389-admin/trunk: adjust include preferences patches

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile
    csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch

Removed Paths:
-------------
    csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-05-02 11:07:38 UTC (rev 17925)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-05-02 11:38:54 UTC (rev 17926)
@@ -25,7 +25,6 @@
 
 # GARFLAVOR=DBG
 
-PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
 PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
 PATCHFILES += 0004-change-include-preferences-in-Makefile.am.patch

Deleted: csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch	2012-05-02 11:07:38 UTC (rev 17925)
+++ csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch	2012-05-02 11:38:54 UTC (rev 17926)
@@ -1,25 +0,0 @@
-From 2cedc89069d4f66c9ce9e24addaa4c13ebd1bca4 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Fri, 13 Jan 2012 13:04:22 +0100
-Subject: [PATCH] change includedir preference in Makefile.am
-
----
- Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 792f782..25ae853 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -99,7 +99,7 @@ libadmin_a_SOURCES = lib/libadmin/cluster.c \
- 	lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
- 	lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
- 
--AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES) @adminutil_inc@ @icu_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -DUSE_ADMSERV=1 \
-+AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES) @adminutil_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @icu_inc@ -DUSE_ADMSERV=1 \
- 	-I$(srcdir)/include -I$(srcdir)/include/base
- if WINNT
- AM_CPPFLAGS += -DXP_WINNT
--- 
-1.7.8.2
-

Modified: csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch	2012-05-02 11:07:38 UTC (rev 17925)
+++ csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch	2012-05-02 11:38:54 UTC (rev 17926)
@@ -11,6 +11,24 @@
 index 25ae853..51327db 100644
 --- a/Makefile.am
 +++ b/Makefile.am
+@@ -104,7 +104,7 @@ libadmin_a_SOURCES = lib/libadmin/cluster.c \
+ 	lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
+ 	lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
+
+-AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES) @adminutil_inc@ @icu_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -DUSE_ADMSERV=1 \
++AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES) @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @icu_inc@ -DUSE_ADMSERV=1 \
+ 	-I$(srcdir)/include -I$(srcdir)/include/base
+ if WINNT
+ AM_CPPFLAGS += -DXP_WINNT
+@@ -294,7 +294,7 @@ libdsa_a_SOURCES = lib/libdsa/dsalib_conf.c \
+ 	lib/libdsa/dsalib_db.c \
+ 	lib/libdsa/dsalib_util.c
+
+-libdsa_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include/libdsa @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
++libdsa_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include/libdsa @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @openldap_inc@
+
+ # source files for our CGI programs
+ download_SOURCES = admserv/cgi-src40/download.c
 @@ -371,7 +371,7 @@ ds_snmpctrl_LINK = $(MYLINK)
  
  ############## mod_admserv ################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.