Skip to content

Commit

Permalink
Added some missing files to the install steps.
Browse files Browse the repository at this point in the history
Added the new files under dcmtk/ofstd/diag to the install steps for both
CMake and Autoconf.
Added docs/CHANGES.XXX to the install steps for both CMake and Autoconf.
  • Loading branch information
Jan Schlamelcher committed Nov 16, 2016
1 parent 0b36181 commit cfd1dc7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ INSTALL(FILES ${DCMTK_BINARY_DIR}/config/include/dcmtk/config/osconfig.h
INSTALL(FILES ANNOUNCE CHANGES COPYRIGHT CREDITS FAQ HISTORY VERSION
DESTINATION ${DCMTK_INSTALL_DOCDIR}
COMPONENT doc)
INSTALL(DIRECTORY docs/ DESTINATION ${DCMTK_INSTALL_DOCDIR}
COMPONENT doc FILES_MATCHING PATTERN "CHANGES.???")

#-----------------------------------------------------------------------------
# Create an install configuration files for external projects
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ check-nosilent-exhaustive: config-check-exhaustive ofstd-check-exhaustive oflog

dcmtk-install-doc:
$(configdir)/mkinstalldirs $(DESTDIR)$(docdir)
for file in ANNOUNCE CHANGES COPYRIGHT CREDITS FAQ HISTORY VERSION; do \
for file in ANNOUNCE CHANGES COPYRIGHT CREDITS FAQ HISTORY VERSION docs/CHANGES.???; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(docdir) ;\
done

Expand Down
2 changes: 1 addition & 1 deletion config/rootconf
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ check-nosilent-exhaustive: $makecheckexhaustive
dcmtk-install-doc:
\$(configdir)/mkinstalldirs \$(DESTDIR)\$(docdir)
for file in ANNOUNCE CHANGES COPYRIGHT CREDITS FAQ HISTORY VERSION; do \\
for file in ANNOUNCE CHANGES COPYRIGHT CREDITS FAQ HISTORY VERSION docs/CHANGES.???; do \\
\$(INSTALL_DATA) \$\$file \$(DESTDIR)\$(docdir) ;\\
done
Expand Down
2 changes: 1 addition & 1 deletion ofstd/include/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# declare installation files
INSTALL(DIRECTORY dcmtk/ofstd DESTINATION ${DCMTK_INSTALL_INCDIR}/dcmtk COMPONENT include FILES_MATCHING PATTERN "*.h")
INSTALL(DIRECTORY dcmtk/ofstd DESTINATION ${DCMTK_INSTALL_INCDIR}/dcmtk COMPONENT include FILES_MATCHING PATTERN "*.h" PATTERN "*.def")
4 changes: 4 additions & 0 deletions ofstd/include/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ install:
for file in dcmtk/ofstd/variadic/*.h ; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/dcmtk/ofstd/variadic ;\
done
$(configdir)/mkinstalldirs $(DESTDIR)$(includedir)/dcmtk/ofstd/diag
for file in dcmtk/ofstd/diag/*.def ; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/dcmtk/ofstd/diag ;\
done

clean:
rm -f $(TRASH)
Expand Down

0 comments on commit cfd1dc7

Please sign in to comment.