Fix Makefile to create include directory on install

mgreter · mgreter · commit 7f2d9739b309 · 2015-07-26T15:00:16.000+02:00
Also move `Makefile.am` in src to `GNUmakefile.am`
diff --git a/Makefile b/Makefile
@@ -244,7 +244,8 @@ $(DESTDIR)$(PREFIX)/lib: $(DESTDIR)$(PREFIX)
 $(DESTDIR)$(PREFIX)/include: $(DESTDIR)$(PREFIX)
 	$(MKDIR) $(DESTDIR)$(PREFIX)/include
 
-$(DESTDIR)$(PREFIX)/include/%.h: include/%.h
+$(DESTDIR)$(PREFIX)/include/%.h: include/%.h \
+                                 $(DESTDIR)$(PREFIX)/include
 	$(INSTALL) -v -m0644 "$<" "$@"
 
 install-headers: $(DESTDIR)$(PREFIX)/include/sass.h \
diff --git a/configure.ac b/configure.ac
@@ -137,5 +137,5 @@ AC_SUBST(PACKAGE_VERSION)
 
 AC_MSG_NOTICE([Building libsass ($VERSION)])
 
-AC_CONFIG_FILES([GNUmakefile src/Makefile src/support/libsass.pc])
+AC_CONFIG_FILES([GNUmakefile src/GNUmakefile src/support/libsass.pc])
 AC_OUTPUT
diff --git a/src/GNUmakefile.am b/src/GNUmakefile.am
diff --git a/src/source_map.cpp b/src/source_map.cpp
@@ -43,8 +43,8 @@ namespace Sass {
     }
     json_append_member(json_srcmap, "sources", json_includes);
 
-    JsonNode *json_contents = json_mkarray();
     if (include_sources) {
+      JsonNode *json_contents = json_mkarray();
       for (size_t i = 0; i < source_index.size(); ++i) {
         const char *content = sources[source_index[i]];
         JsonNode *json_content = json_mkstring(content);

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ namespace Sass {`
`43`	`43`	`}`
`44`	`44`	`json_append_member(json_srcmap, "sources", json_includes);`
`45`	`45`
`46`		`- JsonNode *json_contents = json_mkarray();`
`47`	`46`	`if (include_sources) {`
	`47`	`+ JsonNode *json_contents = json_mkarray();`
`48`	`48`	`for (size_t i = 0; i < source_index.size(); ++i) {`
`49`	`49`	`const char *content = sources[source_index[i]];`
`50`	`50`	`JsonNode *json_content = json_mkstring(content);`