Use GNUmakefile.am not to conflict with static Makefile

Author: saper

.gitignore

@@ -12,7 +12,8 @@ VERSION
 
 # Configuration stuff
 
-Makefile.in
+GNUmakefile.in
+GNUmakefile
 /aclocal.m4
 /autom4te.cache/
 /src/config.h
@@ -35,7 +36,8 @@ Makefile.in
 /script/ltmain.sh
 /script/missing
 /script/test-driver
-/stamp-h1
+/src/stamp-h1
+/src/Makefile.in
 /src/Makefile
 libsass/*
 
@@ -72,4 +74,4 @@ src/support/libsass.pc
 sassc/
 sass-spec/
 
-installer/
+installer/

Makefile.am renamed to GNUmakefile.am

@@ -6,7 +6,7 @@ AC_PREREQ([2.61])
 AC_INIT([libsass], m4_esyscmd_s([./version.sh]), [support@moovweb.com])
 AC_CONFIG_SRCDIR([src/ast.hpp])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_FILES([include/sass_version.h])
 AC_CONFIG_AUX_DIR([script])
 # These are flags passed to automake
@@ -137,5 +137,5 @@ AC_SUBST(PACKAGE_VERSION)
 
 AC_MSG_NOTICE([Building libsass ($VERSION)])
 
-AC_CONFIG_FILES([Makefile src/Makefile src/support/libsass.pc])
+AC_CONFIG_FILES([GNUmakefile src/Makefile src/support/libsass.pc])
 AC_OUTPUT