[csw-devel] SF.net SVN: gar:[5755] csw/mgar/pkg/sendmail/trunk

[valholla at users.sourceforge.net]

Revision: 5755
          http://gar.svn.sourceforge.net/gar/?rev=5755&view=rev
Author:   valholla
Date:     2009-07-30 19:44:48 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
merging benny and my builds

Modified Paths:
--------------
    csw/mgar/pkg/sendmail/trunk/Makefile
    csw/mgar/pkg/sendmail/trunk/files/site.config.m4

Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile	2009-07-30 19:43:06 UTC (rev 5754)
+++ csw/mgar/pkg/sendmail/trunk/Makefile	2009-07-30 19:44:48 UTC (rev 5755)
@@ -26,7 +26,7 @@
 CONFIGURE_SCRIPTS = custom
 BUILD_SCRIPTS     = custom
 TEST_SCRIPTS      = custom
-INSTALL_SCRIPTS   = custom
+#INSTALL_SCRIPTS   = custom
 
 PRESERVECONF  = $(sysconfdir)/mail/aliases.CSW
 PRESERVECONF += $(sysconfdir)/mail/sendmail.cf.CSW
@@ -49,11 +49,12 @@
             rmail/rmail.8 editmap/editmap.8
 
 configure-custom:
+	@( gsed 's,%CFLAGS%,$(CFLAGS),;s,%OCSWCC%,$(CC),' \
+		$(FILEDIR)/site.config.m4 > \
+		$(WORKDIR)/$(DISTNAME)/devtools/Site/site.config.m4
 	@$(MAKECOOKIE)
 
 build-custom:
-	sed 's,%CFLAGS%,$(CFLAGS),;s,%OCSWCC%,$(CC),' $(FILEDIR)/site.config.m4 > \
-		$(WORKDIR)/$(DISTNAME)/devtools/Site/site.config.m4
 	cd $(WORKDIR)/$(DISTNAME) && ./Build
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/site.config.m4	2009-07-30 19:43:06 UTC (rev 5754)
+++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4	2009-07-30 19:44:48 UTC (rev 5755)
@@ -6,9 +6,14 @@
 define(`confEBINDIR',`/opt/csw/lib')
 define(`confMANROOT',`/usr/csw/share/man')
 define(`confMANROOTMAN',`/usr/csw/share/man')
-define(`confMBINDIR',`/opt/csw/bin')
+define(`confMBINDIR',`/opt/csw/lib')
+define(`confEBINDIR',`/opt/csw/lib')
+define(`confUBINDIR',`/opt/csw/bin')
 define(`confSBINDIR',`/opt/csw/sbin')
-define(`confUBINDIR',`/opt/csw/bin')
+define(`confSTDIR', `/opt/csw/etc/mail')
+define(`confSHAREDLIBDIR', `/opt/csw/lib')
+define(`confMANROOT', `/opt/csw/share/man/cat')
+define(`confMANROOTMAN', `/opt/csw/share/man/man')
 define(`confNO_STATISTICS_INSTALL',`True')
 define(`confHFDIR', `/opt/csw/share/mail')
 
@@ -32,6 +37,7 @@
 APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL=2')
 APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_1')
 APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
+APPENDDEF(`confINCDIRS', `-I/opt/csw/include/sasl')
 
 dnl ### add STARTTLS support
 APPENDDEF(`confENVDEF',`-DSTARTTLS')


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