fixed distmaker script for d6/d7

diff --git a/.gitignore b/.gitignore
index 194ac8e4e688d47cfcd335265cc2921ab689ad0b..c212ce4d646552b233470af2be9236d89272a3ea 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -140,4 +140,5 @@ tests/phpunit/CiviTest/civicrm.settings.local.php
 l10n
 vendor
 civicrm.settings.php
-sql/dummy_processor.mysql
\ No newline at end of file
+sql/dummy_processor.mysql
+distmaker/distmaker.conf
\ No newline at end of file

diff --git a/distmaker/distmaker.conf.dist b/distmaker/distmaker.conf.dist
index b10156c09c7b8ec2d0bc1d3999ccd6f7c1ec1e53..9b63873ecc24e0351932bb76ca7ba1421fd684c4 100644 (file)
--- a/distmaker/distmaker.conf.dist
+++ b/distmaker/distmaker.conf.dist
@@ -12,8 +12,8 @@ DM_VERSION= <Set this to whatever the version number should be>
 
 ## Git banch/tag name
 DM_REF_CORE=master
-DM_REF_DRUPAL=${DM_REF_CORE}-7.x
-DM_REF_DRUPAL6=${DM_REF_CORE}-6.x
+DM_REF_DRUPAL=7.x-${DM_REF_CORE}
+DM_REF_DRUPAL6=6.x-${DM_REF_CORE}
 DM_REF_JOOMLA=${DM_REF_CORE}
 DM_REF_WORDPRESS=${DM_REF_CORE}
 DM_REF_PACKAGES=${DM_REF_CORE}