Subject: vendor/luajit is removed in the Debian package
Author: Sebastian Reichel <sre@debian.org>
Forwarded: not-needed
Last-Update: 2014-08-06

Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/header.mk	2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk	2019-03-29 13:17:35.252933339 +0200
@@ -13,7 +13,6 @@ subdirs := \
 	tests \
 	tools \
 	vendor/luabins \
-	vendor/luajit
 
 subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
 
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/Makefile.inc.in	2019-03-29 13:17:21.692386078 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in	2019-03-29 13:17:35.252933339 +0200
@@ -79,7 +79,7 @@ CFLAGS_ICONV       = @ICONV_CFLAGS@
 CFLAGS_ICU         = @ICU_I18N_CFLAGS@
 CFLAGS_LIBASS      = @LIBASS_CFLAGS@
 CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
-CFLAGS_LUA         = @LUAJIT_CFLAGS@
+CFLAGS_LUA         = `pkg-config --cflags luajit`
 CFLAGS_OPENAL      = @OPENAL_CFLAGS@
 CFLAGS_OSS         = @OSS_CFLAGS@
 CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
@@ -97,14 +97,14 @@ LIBS_ICONV         = @ICONV_LIBS@
 LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
 LIBS_LIBASS        = @LIBASS_LIBS@
 LIBS_LIBPULSE      = @LIBPULSE_LIBS@
-LIBS_LUA           = @LUAJIT_LIBS@
+LIBS_LUA           = `pkg-config --libs luajit`
 LIBS_OPENAL        = @OPENAL_LIBS@
 LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
 LIBS_PTHREAD       = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
 LIBS_UCHARDET      = @UCHARDET_LIBS@
 
 ifeq (yes, $(BUILD_DARWIN))
-LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+LIBS_LUA           = `pkg-config --libs luajit`
 endif
 
 FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/Makefile	2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile	2019-03-29 13:17:35.252933339 +0200
@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I
 
 PROGRAM += $(d)repack-thes-dict
 
-$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)")
-
 include $(TOP)Makefile.target
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/libresrc/Makefile	2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile	2019-03-29 13:17:35.252933339 +0200
@@ -10,7 +10,7 @@ resrc_OBJ := \
 
 $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
 
-RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua
+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
 
 $(d)bitmap.cpp: $(d)bitmap.h
 $(d)default_config.cpp: $(d)default_config.h
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua
===================================================================
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/respack.lua	2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua	2019-03-29 13:17:35.252933339 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env luajit
+#!/usr/bin/lua
 -- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
 --
 -- Permission to use, copy, modify, and distribute this software for any