From 2bc399cd9470c6194cea4adcc0a12574ce2be28c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr> Date: Wed, 25 Apr 2012 11:41:37 +0200 Subject: [PATCH] More packaging updates related to the new contrib subdir --- Makefile.am | 2 +- windows/dynare.nsi | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 44b4a537b..735b98041 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,4 +34,4 @@ dist-hook: rm -rf `find $(distdir)/matlab $(distdir)/examples -name *~` rm -f $(distdir)/matlab/dynare_m$(EXEEXT) $(distdir)/matlab/dynare_version.m $(MKDIR_P) $(distdir)/mex/matlab $(distdir)/mex/octave - rm -rf `find $(distdir)/ms-sbvar -name '.git*'` + rm -rf `find $(distdir)/contrib -name '.git*'` diff --git a/windows/dynare.nsi b/windows/dynare.nsi index dfb6c1739..6b08d66e1 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -60,6 +60,9 @@ Section "Dynare core (preprocessor and M-files)" File /r ..\matlab\*.m File ..\matlab\dynare_m.exe + SetOutPath $INSTDIR\contrib + File /r ..\contrib\*.m + WriteUninstaller $INSTDIR\uninstall.exe # Create start menu entries @@ -156,6 +159,7 @@ Section "Uninstall" Delete $INSTDIR\mexopts-win64.bat Delete $INSTDIR\dynare.el Rmdir /r $INSTDIR\matlab + Rmdir /r $INSTDIR\contrib Rmdir /r $INSTDIR\mex Rmdir /r $INSTDIR\dynare++ Rmdir /r $INSTDIR\doc -- GitLab