From 84d3b4de46312c5a5715e3ded6c597cf2bff9392 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Fri, 26 Aug 2011 21:58:50 +0000 Subject: [PATCH] small changes in autotools files --- Makefile.am | 14 +++++++++----- configure.ac | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 84a03325..9984b53d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,18 +24,18 @@ missing EXTRA_DIST = \ CMake/CheckHaveGetopt.cmake \ CMake/OpenJPEGConfig.cmake.in \ -testing/CTestCustom.cmake.in \ -testing/CTestConfig.cmake \ CMakeLists.txt \ -LICENSE \ +AUTHORS \ CHANGES \ -README \ INSTALL \ +LICENSE \ +NEWS \ +README \ +THANKS \ bootstrap.sh \ libopenjpeg1.pc.cmake \ libopenjpeg1.pc.in \ opj_configh.cmake.in \ -opj_config.h.in.user \ m4/opj_check_lib.m4 \ m4/opj_doxygen.m4 \ m4/pkg.m4 @@ -49,7 +49,11 @@ doc: @cd doc && make doc install-data-hook: +if HAVE_WIN32 + $(LN_S) -f libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc +else $(LN_S) -nf libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc +endif @echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt @echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt @cat $(top_builddir)/report.txt diff --git a/configure.ac b/configure.ac index 0a399b60..60223ee6 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_HEADERS([opj_config.h]) AC_CANONICAL_SYSTEM AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(1[.11 foreign dist-bzip2]) +AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) MAJOR_NR=OPJ_MAJOR