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

[dmichelsen at users.sourceforge.net]

Revision: 8502
          http://gar.svn.sourceforge.net/gar/?rev=8502&view=rev
Author:   dmichelsen
Date:     2010-02-11 16:23:24 +0000 (Thu, 11 Feb 2010)

Log Message:
-----------
mutt: More fixes towards 'alternatives'

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

Modified: csw/mgar/pkg/mutt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mutt/trunk/Makefile	2010-02-11 16:07:45 UTC (rev 8501)
+++ csw/mgar/pkg/mutt/trunk/Makefile	2010-02-11 16:23:24 UTC (rev 8502)
@@ -75,14 +75,19 @@
 MIGRATE_FILES_CSWmutt-base = mime.types Muttrc
 
 MERGE_SCRIPTS_isa-default-slang-no = copy-all
-MERGE_SCRIPTS_isa-default-slang-yes = copy-mutt-only
+MERGE_SCRIPTS_isa-default-slang-yes = copy-all
 
-PKGFILES_CSWmutt-ncurses = $(bindir)/mutt
+EXTRA_PAX_ARGS_slang-no = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-ncurses,p"
+EXTRA_PAX_ARGS_slang-yes = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-slang,p" -s ",.*,,"
+EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_slang-$(SLANG))
+
+# CSWmutt-base gets all the rest
+PKGFILES_CSWmutt-ncurses = $(bindir)/mutt-ncurses
 PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang
 
+ALTERNATIVES_CSWmutt-ncurses = ncurses
+ALTERNATIVES_CSWmutt-slang = slang
+ALTERNATIVE_ncurses = $(bindir)/mutt mutt $(bindir)/mutt-ncurses 100
+ALTERNATIVE_slang = $(bindir)/mutt mutt $(bindir)/mutt-slang 200
+
 include gar/category.mk
-
-merge-copy-mutt-only: $(PKGROOT)
-	ginstall -d $(PKGROOT)$(bindir)
-	ginstall $(INSTALLISADIR)$(bindir)/mutt $(PKGROOT)$(bindir)/mutt-slang
-	@$(MAKECOOKIE)


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