[csw-devel] SF.net SVN: gar:[15198] csw/mgar/pkg/lftp/trunk/Makefile

[chninkel at users.sourceforge.net]

Revision: 15198
          http://gar.svn.sourceforge.net/gar/?rev=15198&view=rev
Author:   chninkel
Date:     2011-07-23 01:18:33 +0000 (Sat, 23 Jul 2011)

Log Message:
-----------
lftp: fixed merge excluding

Modified Paths:
--------------
    csw/mgar/pkg/lftp/trunk/Makefile

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2011-07-23 00:59:30 UTC (rev 15197)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2011-07-23 01:18:33 UTC (rev 15198)
@@ -69,7 +69,7 @@
 PRESERVECONF = $(sysconfdir)/lftp.conf
 MIGRATE_FILES_CSWlftp = lftp.conf
 
-MERGE_EXCLUDE_FILES  = .*/charset.alias
+EXTRA_MERGE_EXCLUDE_FILES  = .*/charset.alias
 
 ##### Build and installation information #####
 


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