Adjust build tools for repackaged upstream source

Last-Update: 2016-05-25

Last-Update: 2016-05-25
Gbp-Pq: Name 2001_repackaging_fixup.patch

diff --git a/Makefile.am b/Makefile.am
index 821f35c03bf8c385b2792800077ad72ab401a45c..bd4287b8f5fe0c8a2fd2af2238e63c07f84f8783 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,7 @@ SUBDIRS += pyhook
 endif PYTHON_EXTENSION
 
 if MACINTOSH
-SUBDIRS += mackeys osx
+SUBDIRS += mackeys
 endif MACINTOSH
 
 if XDG_DESKTOP

diff --git a/configure.ac b/configure.ac
index ded4e0c3199f1cb3c8f802f5d4479eb3f1b8a878..a755cd650ad15a2e22e6e3685b7bc82de4a5f5f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -740,46 +740,10 @@ desktop/Makefile
 contrib/Makefile
 contrib/cidmap/Makefile
 contrib/fonttools/Makefile
-osx/Makefile
-osx/FontForge.app/Makefile
-osx/FontForge.app/Contents/Makefile
-osx/FontForge.app/Contents/Resources/Makefile
-osx/FontForge.app/Contents/Resources/English.lproj/Makefile
-osx/FontForge.app/Contents/Resources/opt/Makefile
-osx/FontForge.app/Contents/Resources/opt/local/Makefile
-osx/FontForge.app/Contents/Resources/opt/local/etc/Makefile
-osx/FontForge.app/Contents/Resources/opt/local/etc/fonts/Makefile
-osx/FontForge.app/Contents/Resources/breakpad/Makefile
-osx/FontForge.app/Contents/Resources/breakpad/webinterface/Makefile
-osx/FontForge.app/Contents/Resources/breakpad/webinterface/support/Makefile
-osx/FontForge.app/Contents/MacOS/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/MacOS/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Resources/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Resources/Inputbox.nib/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Resources/MainMenu.nib/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Resources/Msgbox.nib/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Resources/PopUpButton.nib/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Resources/Progressbar.nib/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Resources/SecureInputbox.nib/Makefile
-osx/FontForge.app/Contents/MacOS/CocoaDialog.app/Contents/Resources/Textbox.nib/Makefile
-osx/FontForge.app/Contents/Frameworks/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/A/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/A/Headers/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/MacOS/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/Makefile
-osx/FontForge.app/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Contents/Resources/English.lproj/Makefile
 breakpad/Makefile
 breakpad/server/Makefile
 
 fontforge.pc
-osx/FontForge.app/Contents/Info.plist
 ])
 
 #--------------------------------------------------------------------------