Skip to content

Commit 5ce6025

Browse files
committed
Revert "also use DESTDIR in makefile.m{ingw,svc}"
This reverts commit 1655e63. As of @karel-m [1] "I am not sure whether DESTDIR concept make sense for MS Windows paths. For example: `make -f makefile.mingw DESTDIR=c:\builddir\ PREFIX=c:\installdir` means that `"$(DESTDIR)$(PREFIX)\bin"` will expand to `"c:\builddir\c:\installdir\bin"` which is obviously invalid. I propose reverting `also use DESTDIR in makefile.m{ingw,svc}`." [1] #234 (comment)
1 parent 09c4d4c commit 5ce6025

2 files changed

Lines changed: 20 additions & 22 deletions

File tree

makefile.mingw

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616

1717
#The following can be overridden from command line e.g. make -f makefile.mingw CC=gcc ARFLAGS=rcs
18-
DESTDIR =
1918
PREFIX = c:\mingw
2019
CC = gcc
2120
AR = ar
@@ -264,20 +263,20 @@ clean:
264263

265264
#Install the library + headers
266265
install: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D)
267-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
268-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\lib" mkdir "$(DESTDIR)$(PREFIX)\lib"
269-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\include" mkdir "$(DESTDIR)$(PREFIX)\include"
270-
copy /Y $(LIBMAIN_S) "$(DESTDIR)$(PREFIX)\lib"
271-
copy /Y $(LIBMAIN_I) "$(DESTDIR)$(PREFIX)\lib"
272-
copy /Y $(LIBMAIN_D) "$(DESTDIR)$(PREFIX)\bin"
273-
copy /Y src\headers\tomcrypt*.h "$(DESTDIR)$(PREFIX)\include"
266+
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
267+
cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
268+
cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
269+
copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
270+
copy /Y $(LIBMAIN_I) "$(PREFIX)\lib"
271+
copy /Y $(LIBMAIN_D) "$(PREFIX)\bin"
272+
copy /Y src\headers\tomcrypt*.h "$(PREFIX)\include"
274273

275274
#Install useful tools
276275
install_bins: hashsum
277-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
278-
copy /Y hashsum.exe "$(DESTDIR)$(PREFIX)\bin"
276+
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
277+
copy /Y hashsum.exe "$(PREFIX)\bin"
279278

280279
#Install documentation
281280
install_docs: doc/crypt.pdf
282-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\doc" mkdir "$(DESTDIR)$(PREFIX)\doc"
283-
copy /Y doc\crypt.pdf "$(DESTDIR)$(PREFIX)\doc"
281+
cmd /c if not exist "$(PREFIX)\doc" mkdir "$(PREFIX)\doc"
282+
copy /Y doc\crypt.pdf "$(PREFIX)\doc"

makefile.msvc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616

1717
#The following can be overridden from command line e.g. make -f makefile.msvc CC=gcc ARFLAGS=rcs
18-
DESTDIR =
1918
PREFIX = c:\devel
2019
CFLAGS = /Ox /DUSE_LTM /DLTM_DESC /I../libtommath
2120
EXTRALIBS = ../libtommath/tommath.lib
@@ -251,18 +250,18 @@ clean:
251250

252251
#Install the library + headers
253252
install: $(LIBMAIN_S)
254-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
255-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\lib" mkdir "$(DESTDIR)$(PREFIX)\lib"
256-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\include" mkdir "$(DESTDIR)$(PREFIX)\include"
257-
copy /Y $(LIBMAIN_S) "$(DESTDIR)$(PREFIX)\lib"
258-
copy /Y src\headers\tomcrypt*.h "$(DESTDIR)$(PREFIX)\include"
253+
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
254+
cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
255+
cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
256+
copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
257+
copy /Y src\headers\tomcrypt*.h "$(PREFIX)\include"
259258

260259
#Install useful tools
261260
install_bins: hashsum
262-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
263-
copy /Y hashsum.exe "$(DESTDIR)$(PREFIX)\bin"
261+
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
262+
copy /Y hashsum.exe "$(PREFIX)\bin"
264263

265264
#Install documentation
266265
install_docs: doc/crypt.pdf
267-
cmd /c if not exist "$(DESTDIR)$(PREFIX)\doc" mkdir "$(DESTDIR)$(PREFIX)\doc"
268-
copy /Y doc\crypt.pdf "$(DESTDIR)$(PREFIX)\doc"
266+
cmd /c if not exist "$(PREFIX)\doc" mkdir "$(PREFIX)\doc"
267+
copy /Y doc\crypt.pdf "$(PREFIX)\doc"

0 commit comments

Comments
 (0)