From c6b4569824c950cac0714f9ae0e1b383d5a3ba03 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 15 Apr 2016 08:52:21 -0700
Subject: [PATCH] Remove extension when sorting so X.coffee comes before
 X.Y.coffee.

---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index d31b0708a..67657a338 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,8 @@ parts := Config API classes General Filtering Quotelinks Posting Images Linkific
 
 intermediate := LICENSE src/meta/fbegin.js tmp/declaration.js tmp/globals.js $(foreach p,$(parts),tmp/$(p).js) src/meta/fend.js
 
-define sorted_dir
-sources_$1 := $$(sort $$(wildcard src/$1/*.coffee))
-endef
+# remove extension when sorting so X.coffee comes before X.Y.coffee
+sort_dir = $(subst !,.coffee,$(sort $(subst .coffee,!,$(wildcard src/$1/*.coffee))))
 
 sources_Config := \
  src/General/Config.coffee
@@ -52,7 +51,7 @@ sources_General := \
 
 $(foreach d, \
  Filtering Quotelinks \
- ,$(eval $(call sorted_dir,$(d))))
+ ,$(eval sources_$(d) := $(call sort_dir,$(d))))
 
 sources_Posting := \
  src/Posting/QR.coffee \
@@ -63,11 +62,11 @@ sources_Posting := \
  $(sort $(wildcard src/Posting/QR.*.coffee))
 
 sources_Images := \
- $(sort $(filter-out %/ImageCommon.coffee,$(wildcard src/Images/*.coffee)))
+ $(filter-out %/ImageCommon.coffee,$(call sort_dir,Images))
 
 $(foreach d, \
  Linkification Menu Monitoring Archive Miscellaneous \
-S ,$(eval $(call sorted_dir,$(d))))
+S ,$(eval sources_$(d) := $(call sort_dir,$(d))))
 
 sources_Main := \
  src/General/Main.coffee