From 2f78f8d37c50f0c91822e8fd335eea45fb2a6524 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Wed, 15 Jan 2020 02:08:46 +0100
Subject: [PATCH] Solving a small bug with the makefile

---
 Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 3d4500d8..c1f33c69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 FFMPEG = transcoder/ffmpeg
-CONF_FFMEG = $(FFMPEG)/config.h
-FFMPEG_CONF = $(FFMPEG)/configure
-FFMPEG_OPT =	--pkg-config-flags=--static \
+CONFIG = $(FFMPEG)/config.h
+OPTIONS =	--pkg-config-flags=--static \
 		--disable-shared \
 		--enable-static \
 		--disable-asm \
@@ -11,7 +10,7 @@ FFMPEG_OPT =	--pkg-config-flags=--static \
 		--disable-ffprobe \
 		--disable-ffmpeg
 
-TRANSCODER_DIR = transcoder/build
+TRANSCODERDIR = transcoder/build
 
 NEEDED = 	dotnet \
 		cmake \
@@ -32,19 +31,19 @@ dependencies:
 		$$pkg --version >> /dev/null 2>&1 || ($(ECHO) "$(RED)ERROR: $$pkg could not be found.$(NOCOL)"; exit 1); \
 	done
 
-$(CONF_FFMPEG):
+$(CONFIG):
 	$(ECHO) "$(COL)Configuring FFMPEG$(NOCOL)"
-	$(FFMPEG_CONF) $(FFMPEG_OPT)
+	cd $(FFMPEG) && ./configure $(OPTIONS)
 
-ffmpeg: $(CONF_FFMPEG)
+ffmpeg: $(CONFIG)
 	$(ECHO) "$(COL)Building FFMPEG$(NOCOL)"
 	$(MAKE) -C $(FFMPEG)
 
 transcoder: ffmpeg
 	$(ECHO) "$(COL)Building the transcoder$(NOCOL)"
-	mkdir --parent $(TRANSCODER_DIR)
-	cd $(TRANSCODER_DIR) && cmake .. && make
-	mv $(TRANSCODER_DIR)/libtranscoder.so Kyoo/
+	mkdir --parent $(TRANSCODERDIR)
+	cd $(TRANSCODERDIR) && cmake .. && make
+	mv $(TRANSCODERDIR)/libtranscoder.so Kyoo/
 	$(ECHO) "$(COL)Transcoder built$(NOCOL)"