summaryrefslogtreecommitdiff
path: root/misc/auto-multiple-choice/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'misc/auto-multiple-choice/files/patch-Makefile')
-rw-r--r--misc/auto-multiple-choice/files/patch-Makefile65
1 files changed, 0 insertions, 65 deletions
diff --git a/misc/auto-multiple-choice/files/patch-Makefile b/misc/auto-multiple-choice/files/patch-Makefile
deleted file mode 100644
index 9fd80af1cc65..000000000000
--- a/misc/auto-multiple-choice/files/patch-Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
---- Makefile.orig 2016-03-16 08:18:02 UTC
-+++ Makefile
-@@ -43,7 +43,7 @@ CXXFLAGS ?= -O2
- # try to find right names for OpenCV libs
-
- ifeq ($(GCC_OPENCV_LIBS),auto)
--ifeq ($(shell echo 'int main(){}' | gcc -xc -lopencv_core - && ( rm -f a.out ; echo "OK")),OK)
-+ifeq ($(shell echo 'int main(){}' | $(CC) -xc $(LDFLAGS) -lopencv_core - && ( rm -f a.out ; echo "OK")),OK)
- GCC_OPENCV_LIBS:=-lopencv_core -lopencv_highgui -lopencv_imgproc
- else
- GCC_OPENCV_LIBS:=-lcv -lhighgui -lcxcore
-@@ -210,13 +210,13 @@ endif
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MODSDIR)/perl
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MODSDIR)/exec
- install -m 0755 $(USER_GROUP) $(MODS) $(DESTDIR)/$(MODSDIR)/perl
-- install -m 0755 $(USER_GROUP) $(BINARIES) $(DESTDIR)/$(MODSDIR)/exec
-+ install -s -m 0755 $(USER_GROUP) $(BINARIES) $(DESTDIR)/$(MODSDIR)/exec
- install -m 0644 $(USER_GROUP) $(GLADE) $(DESTDIR)/$(MODSDIR)/perl
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(TEXDIR)
- install -m 0644 $(USER_GROUP) $(STY) $(DESTDIR)/$(TEXDIR)
- ifneq ($(DESKTOPDIR),)
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(DESKTOPDIR)
-- install -m 0644 $(USER_GROUP) -T auto-multiple-choice.desktop $(DESTDIR)/$(DESKTOPDIR)/auto-multiple-choice.desktop
-+ install -m 0644 $(USER_GROUP) auto-multiple-choice.desktop $(DESTDIR)/$(DESKTOPDIR)/auto-multiple-choice.desktop
- endif
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(BINDIR)
- install -m 0755 $(USER_GROUP) auto-multiple-choice $(DESTDIR)/$(BINDIR)
-@@ -224,7 +224,7 @@ endif
- install -m 0644 $(USER_GROUP) icons/*.svg $(DESTDIR)/$(ICONSDIR)
- ifneq ($(PIXDIR),)
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PIXDIR)
-- install -m 0644 $(USER_GROUP) -T $(MAIN_LOGO).xpm $(DESTDIR)/$(PIXDIR)/auto-multiple-choice.xpm
-+ install -m 0644 $(USER_GROUP) $(MAIN_LOGO).xpm $(DESTDIR)/$(PIXDIR)/auto-multiple-choice.xpm
- endif
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PERLDIR)/AMC
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PERLDIR)/AMC/Export
-@@ -253,6 +253,7 @@ endif
- ifneq ($(SYSTEM_TYPE),deb) # with debian, done with dh_install{doc,man}
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(DOCDIR)
- install -m 0644 $(USER_GROUP) $(wildcard doc/auto-multiple-choice.??.xml doc/auto-multiple-choice.??.pdf) $(DESTDIR)/$(DOCDIR)
-+ rm -f doc/html/images/callouts/.hgempty
- cp -r doc/html $(DESTDIR)/$(DOCDIR)
- ifeq ($(INSTALL_USER),)
- else
-@@ -263,7 +264,19 @@ else
- chgrp -hR $(INSTALL_GROUP) $(DESTDIR)/$(DOCDIR)
- endif
- install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MAN1DIR)
-- install -m 0644 $(USER_GROUP) doc/*.1 $(DESTDIR)/$(MAN1DIR)
-+ for f in doc/AMC-*.1; do \
-+ case $$f in \
-+ *.??.1) ;; \
-+ *) install -m 0644 $(USER_GROUP) $$f $(DESTDIR)/$(MAN1DIR) ;; \
-+ esac; \
-+ done
-+ install -m 0644 $(USER_GROUP) doc/auto-multiple-choice.1 $(DESTDIR)/$(MAN1DIR)
-+ mkdir -p $(DESTDIR)/$(FRMAN1DIR)
-+ install -m 0644 $(USER_GROUP) doc/auto-multiple-choice.fr.1 $(DESTDIR)/$(FRMAN1DIR)/auto-multiple-choice.1
-+ mkdir -p $(DESTDIR)/$(JAMAN1DIR)
-+ for f in doc/*.ja.1; do \
-+ iconv -f UTF-8 -t EUC-JP < $$f > $(DESTDIR)/$(JAMAN1DIR)/`expr $$f : 'doc/\(.*\).ja.1'`.1; \
-+ done
- endif
-
- install: install_nodoc install_doc ;