generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small changes in autotools files

Browse Source
This commit is contained in:
Antonin Descampe 2011-08-26 21:58:50 +00:00
parent 925a772dce
commit 84d3b4de46
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -24,18 +24,18 @@ missing
EXTRA_DIST = \ EXTRA_DIST = \
CMake/CheckHaveGetopt.cmake \ CMake/CheckHaveGetopt.cmake \
CMake/OpenJPEGConfig.cmake.in \ CMake/OpenJPEGConfig.cmake.in \
testing/CTestCustom.cmake.in \
testing/CTestConfig.cmake \
CMakeLists.txt \ CMakeLists.txt \
LICENSE \ AUTHORS \
CHANGES \ CHANGES \
README \
INSTALL \ INSTALL \
LICENSE \
NEWS \
README \
THANKS \
bootstrap.sh \ bootstrap.sh \
libopenjpeg1.pc.cmake \ libopenjpeg1.pc.cmake \
libopenjpeg1.pc.in \ libopenjpeg1.pc.in \
opj_configh.cmake.in \ opj_configh.cmake.in \
opj_config.h.in.user \
m4/opj_check_lib.m4 \ m4/opj_check_lib.m4 \
m4/opj_doxygen.m4 \ m4/opj_doxygen.m4 \
m4/pkg.m4 m4/pkg.m4
@ -49,7 +49,11 @@ doc:
@cd doc && make doc @cd doc && make doc
install-data-hook: 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 $(LN_S) -nf libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
endif
@echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt @echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt
@echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt @echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt
@cat $(top_builddir)/report.txt @cat $(top_builddir)/report.txt

2
configure.ac
View File

@ -26,7 +26,7 @@ AC_CONFIG_HEADERS([opj_config.h])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AC_CANONICAL_HOST 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])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
MAJOR_NR=OPJ_MAJOR MAJOR_NR=OPJ_MAJOR