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

[dmichelsen at users.sourceforge.net]

Revision: 7990
          http://gar.svn.sourceforge.net/gar/?rev=7990&view=rev
Author:   dmichelsen
Date:     2010-01-13 16:15:59 +0000 (Wed, 13 Jan 2010)

Log Message:
-----------
mtr: Use collapsed merge rule

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

Modified: csw/mgar/pkg/mtr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mtr/trunk/Makefile	2010-01-13 16:13:54 UTC (rev 7989)
+++ csw/mgar/pkg/mtr/trunk/Makefile	2010-01-13 16:15:59 UTC (rev 7990)
@@ -78,16 +78,9 @@
 EXTRA_SOS_LD_FLAGS    = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 endif
 
-# These two should work instead of the four ones below, but they don't.
-# license is the only file that ends up in pkgroot/.
-#MERGE_SCRIPTS_isa-default-gui-enable  = copy-all
-#MERGE_SCRIPTS_isa-default-gui-disable = copy-all
+MERGE_SCRIPTS_isa-default-gui-enable  = copy-all
+MERGE_SCRIPTS_isa-default-gui-disable = copy-all
 
-MERGE_SCRIPTS_isa-i386-gui-enable  = copy-all
-MERGE_SCRIPTS_isa-sparcv8-gui-enable  = copy-all
-MERGE_SCRIPTS_isa-i386-gui-disable = copy-all
-MERGE_SCRIPTS_isa-sparcv8-gui-disable = copy-all
-
 # Make mtr setuid so that it can access raw sockets
 PROTOTYPE_MODIFIERS = makesuid
 PROTOTYPE_FILES_makesuid = $(sbindir)/x?mtr


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