Changeset 23259b9 in sasmodels


Ignore:
Timestamp:
Nov 23, 2015 3:01:27 PM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
0e9048f
Parents:
73a3e22
Message:

allow docs to build from windows/anaconda command prompt, assuming gnu make is available

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/Makefile

    r61ba623 r23259b9  
    4646 
    4747model/img/%: ../sasmodels/models/img/% 
     48ifdef ComSpec 
     49        $(COPY) $(subst /,\\,$<) $(subst /,\\,$@) 
     50else 
    4851        $(COPY) $< $@ 
     52endif 
    4953 
    5054model/%.rst: ../sasmodels/models/%.py 
    … …  
    6266model: 
    6367        $(MKDIR) model 
     68ifdef ComSpec 
     69        $(MKDIR) model\img 
     70else 
    6471        $(MKDIR) model/img 
     72endif 
    6573 
    6674build: model $(MODELS_RST) $(IMG_DEST) api ref/models/index.rst 
     75ifdef ComSpec 
     76        rem cd ..\.. 
     77        rem python setup.py build 
     78else 
    6779        #cd ../.. && python setup.py build 
     80endif 
    6881 
    6982upload: 
    … …  
    7285 
    7386clean: 
    74         -rm -rf _build model api 
     87        -$(RMDIR) _build model api 
    7588 
    7689html: build 
Note: See TracChangeset for help on using the changeset viewer.